index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | contrib/.gitignore | 9 | ||||
-rw-r--r-- | contrib/Makefile.am | 11 | ||||
-rw-r--r-- | contrib/PKGBUILD.vim (renamed from contrib/PKGBUILD.vim.in) | 0 | ||||
-rwxr-xr-x | contrib/bacman.in | 2 | ||||
-rwxr-xr-x | contrib/pacdiff.in | 2 | ||||
-rwxr-xr-x | contrib/pacscripts.in | 2 | ||||
-rwxr-xr-x | contrib/pactree.in | 2 | ||||
-rw-r--r-- | contrib/vimprojects (renamed from contrib/vimprojects.in) | 0 | ||||
-rwxr-xr-x | contrib/wget-xdelta.sh.in | 2 |
diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..91044765 --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1,9 @@ +bacman +bash_completion +pacdiff +paclist +pacscripts +pacsearch +pactree +wget-xdelta.sh +zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index dd0b767c..55366b47 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,4 @@ OURFILES = \ - PKGBUILD.vim \ bacman \ bash_completion \ pacdiff \ @@ -7,12 +6,11 @@ OURFILES = \ pacscripts \ pacsearch \ pactree \ - vimprojects \ wget-xdelta.sh \ zsh_completion EXTRA_DIST = \ - PKGBUILD.vim.in \ + PKGBUILD.vim \ bacman.in \ bash_completion.in \ pacdiff.in \ @@ -20,7 +18,7 @@ EXTRA_DIST = \ pacscripts.in \ pacsearch.in \ pactree.in \ - vimprojects.in \ + vimprojects \ wget-xdelta.sh.in \ zsh_completion.in \ README @@ -31,12 +29,13 @@ MOSTLYCLEANFILES = $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@BASH[@]|$(BASH)|g' + -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' $(OURFILES): Makefile + @echo ' ' GEN $@; @rm -f $@ $@.tmp @cp -a $@.in $@.tmp - $(edit) $@.in >$@.tmp + @$(edit) $@.in >$@.tmp @mv $@.tmp $@ all-am: $(OURFILES) diff --git a/contrib/PKGBUILD.vim.in b/contrib/PKGBUILD.vim index 8b40ed7c..8b40ed7c 100644 --- a/contrib/PKGBUILD.vim.in +++ b/contrib/PKGBUILD.vim diff --git a/contrib/bacman.in b/contrib/bacman.in index 2a93f8be..991acb00 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!@BASH@ +#!@BASH_SHELL@ # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 716333a0..ac4ce893 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!@BASH@ +#!@BASH_SHELL@ # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 123c79df..d3664091 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!@BASH@ +#!@BASH_SHELL@ # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package diff --git a/contrib/pactree.in b/contrib/pactree.in index 29c6af6c..b43005a8 100755 --- a/contrib/pactree.in +++ b/contrib/pactree.in @@ -1,4 +1,4 @@ -#!@BASH@ +#!@BASH_SHELL@ # pactree : a simple dependency tree viewer # # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci@gmail.com> diff --git a/contrib/vimprojects.in b/contrib/vimprojects index e9adfdf1..e9adfdf1 100644 --- a/contrib/vimprojects.in +++ b/contrib/vimprojects diff --git a/contrib/wget-xdelta.sh.in b/contrib/wget-xdelta.sh.in index caf0171e..f2ac1c87 100755 --- a/contrib/wget-xdelta.sh.in +++ b/contrib/wget-xdelta.sh.in @@ -1,4 +1,4 @@ -#!@BASH@ +#!@BASH_SHELL@ if [ -r "@sysconfdir@/makepkg.conf" ]; then source @sysconfdir@/makepkg.conf |