summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2012-01-10 11:08:54 +0100
committerJean Delvare <jdelvare@suse.de>2012-01-10 11:08:54 +0100
commit996d75ddd7489d026b905276dd02bc5679e3ecf6 (patch)
tree9f5283231f55bcb0ef8aef3be11b830e30b1aa6f
parentc24a5fa8917aabc8b795862ca12d5def54657841 (diff)
downloadquilt-996d75ddd7489d026b905276dd02bc5679e3ecf6.tar.gz
No need to delete doc/quilt.1 twice on "make clean"
-rw-r--r--Makefile.in8
-rw-r--r--quilt.changes8
2 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 2b2616e..291a03d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,19 +101,19 @@ LIB := backup-files$(EXEEXT)
SRC += $(LIB_SRC:%=lib/%)
DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o)
-DOC_IN := README
+DOC_IN := README quilt.1
DOC_SRC := $(DOC_IN:%=doc/%.in)
DOC := $(DOC_IN)
SRC += $(DOC_SRC)
-SRC += doc/main.tex doc/quilt.pdf doc/Makefile doc/quilt.1.in \
+SRC += doc/main.tex doc/quilt.pdf doc/Makefile \
doc/README.MAIL doc/README.EMACS
-DIRT += $(DOC_IN:%=doc/%) doc/quilt.1
+DIRT += $(DOC_IN:%=doc/%)
MAN1 := doc/quilt.1
ifneq ($(POD2MAN),)
MAN1 += bin/guards.1
+DIRT += bin/guards.1
endif
-DIRT += $(MAN1)
LINGUAS := fr de ja ru
PO := quilt.pot $(LINGUAS:%=%.po)
diff --git a/quilt.changes b/quilt.changes
index 4115eb0..b5b1f21 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 10 11:05:36 CET 2012 - jdelvare@suse.de
+
+- Makefile.in: No need to delete doc/quilt.1 twice on "make clean".
+
+-------------------------------------------------------------------
Mon Jan 9 20:49:04 CET 2012 - mquinson@debian.org
+
- Makefile.in:
- revert the change to fix the generation of quilt.1 with dash
It induced relying on GNU sed, which introduce severe portability
@@ -8,6 +15,7 @@ Mon Jan 9 20:49:04 CET 2012 - mquinson@debian.org
is the default shell (bash is installed anyway since our scripts
use it)
+-------------------------------------------------------------------
Mon Jan 2 11:02:38 CET 2012 - mquinson@debian.org
- Makefile.in: Fix auto-generation of quilt.1 to work with dash