Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-12 08:26:50 -0500
committerDan McGee <dan@archlinux.org>2010-10-12 08:26:50 -0500
commita7dc3875f15f9600e011c313c8846de6af3a2c8c (patch)
tree978c7cdb44c03e617ad5f67f2a7bf35bb07d845a
parent5fcb005ebd270c1ecff3403695680145253961a2 (diff)
contrib/ follow-up work
* Add a .gitignore file * Use the same 'GEN' output we have in the scripts/ Makefile when doing our edits on the .in files * Remove PKGBUILD.vim and vimprojects from our edit list, they have no need to be in the list Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--contrib/.gitignore9
-rw-r--r--contrib/Makefile.am9
-rw-r--r--contrib/PKGBUILD.vim (renamed from contrib/PKGBUILD.vim.in)0
-rw-r--r--contrib/vimprojects (renamed from contrib/vimprojects.in)0
4 files changed, 13 insertions, 5 deletions
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..01997631 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
@@ -34,9 +32,10 @@ edit = sed \
-e 's|@BASH[@]|$(BASH)|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/vimprojects.in b/contrib/vimprojects
index e9adfdf1..e9adfdf1 100644
--- a/contrib/vimprojects.in
+++ b/contrib/vimprojects