Some minor cleanups

3 files changed, 42 insertions, 37 deletions

diff --git a/Makefile.in b/Makefile.in
index 559bc05..1335d9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ DIRT +=		$(shell find -name '*~')
 
 SRC +=		COPYING AUTHORS TODO BUGS Makefile.in \
 		configure.ac config/install-sh \
-		quilt.spec.in quilt.spec quilt.changes
+		quilt.spec.in quilt.changes
 DIRT +=		quilt.spec
 
 BIN_IN :=	quilt guards
@@ -109,14 +109,14 @@ bin/guards.1 : bin/guards
 	mkdir -p $$(dirname $@)
 	pod2man $< > $@
 
-$(PACKAGE)-$(VERSION).tar.gz : $(SRC) configure
+$(PACKAGE)-$(VERSION).tar.gz : $(SRC) configure $(PACKAGE).spec
 	rm -f $(PACKAGE)-$(VERSION) $@
 	ln -s . $(PACKAGE)-$(VERSION)
 	tar chf - $(+:%=$(PACKAGE)-$(VERSION)/%) | gzip -9 > $@
 	rm -f $(PACKAGE)-$(VERSION)
 	@echo "File $@ created."
 
-$(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure
+$(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure $(PACKAGE).spec
 	rm -f $(PACKAGE)-$(ISODATE) $@
 	ln -s . $(PACKAGE)-$(ISODATE)
 	tar chf - $(+:%=$(PACKAGE)-$(ISODATE)/%) | bzip2 -9 > $@
@@ -126,28 +126,6 @@ $(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure
 configure : configure.ac
 	autoconf
 
-install : scripts
-	@INSTALL@ -d $(BUILD_ROOT)$(bindir)
-	@INSTALL@ -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/
-
-	@INSTALL@ -d $(BUILD_ROOT)$(QUILT_DIR)
-	@INSTALL@ -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/
-	
-	@INSTALL@ -d $(BUILD_ROOT)$(SCRIPTS_DIR)
-	@INSTALL@ -m 755 $(filter-out scripts/patchfns, \
-				      $(SCRIPTS:%=scripts/%)) \
-		  $(BUILD_ROOT)$(SCRIPTS_DIR)
-	@INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
-
-	@INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
-	@INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
-
-	@INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)
-	@INSTALL@ -m 644 doc/README $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
-
-	@INSTALL@ -d $(BUILD_ROOT)$(mandir)/man1
-	@INSTALL@ -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
-
 $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \
 		  scripts/parse-patch
 	@echo "Generating spec file"
@@ -158,7 +136,7 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \
 		m/^(|-+)$$/ and next; \
 		( \
 		  s/^(...) \s (...) \s (.\d) \s (\d\d:\d\d:\d\d) \s \
-		     (...) \s (\d\d\d\d) \s - \s (.+) \
+		     ([A-Z]+|[-+]\d{4}) \s (\d\d\d\d) \s - \s (.+) \
 		   /* $$1 $$2 $$3 $$6 - $$7/x || \
 		  m/^(- |  )(?!\s)/ \
 		  and print \
@@ -166,13 +144,6 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \
 	' $(PACKAGE).changes \
 	| scripts/parse-patch -u changelog $@
 
-clean :
-	rm -f $(DIRT)
-	
-distclean : clean
-	rm -f config.log config.status Makefile
-	rm -rf autom4te.cache/
-
 % : %.in
 	@echo "$< -> $@"
 	@sed -e 's:@LIB''@:$(LIB_DIR):g' \
@@ -189,3 +160,36 @@ distclean : clean
 	     -e 's:@RELEASE''@:$(RELEASE):g' \
 	     $< > $@
 	@chmod --reference=$< $@
+
+Makefile.in : Makefile
+	echo "Please run ./configure by hand"
+	false
+
+install : scripts
+	@INSTALL@ -d $(BUILD_ROOT)$(bindir)
+	@INSTALL@ -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/
+
+	@INSTALL@ -d $(BUILD_ROOT)$(QUILT_DIR)
+	@INSTALL@ -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/
+	
+	@INSTALL@ -d $(BUILD_ROOT)$(SCRIPTS_DIR)
+	@INSTALL@ -m 755 $(filter-out scripts/patchfns, \
+				      $(SCRIPTS:%=scripts/%)) \
+		  $(BUILD_ROOT)$(SCRIPTS_DIR)
+	@INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
+
+	@INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
+	@INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
+
+	@INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)
+	@INSTALL@ -m 644 doc/README $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
+
+	@INSTALL@ -d $(BUILD_ROOT)$(mandir)/man1
+	@INSTALL@ -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
+
+clean :
+	rm -f $(DIRT)
+	
+distclean : clean
+	rm -f config.log config.status Makefile
+	rm -rf autom4te.cache/
diff --git a/quilt.changes b/quilt.changes
index 4d559a2..8ef919e 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Sat Feb  1 18:52:15 CET 2003 - agruen@suse.de
+Sat Feb  1 18:52:15 +0100 2003 - agruen@suse.de
 
 - Integrate James Rowe's Autoconf setup (with a comple of
   additional changes/fixes).
@@ -10,7 +10,7 @@ Sat Feb  1 18:52:15 CET 2003 - agruen@suse.de
 - Merge James Rowe's guidiff.
 
 -------------------------------------------------------------------
-Fri Jan 31 13:05:18 CET 2003 - agruen@suse.de
+Fri Jan 31 13:05:18 +0100 2003 - agruen@suse.de
 
 - Add syntax highlighting tags for emacs and vim.
 - Move all scripts from lib/ to scripts/. Install lib/backup-files
@@ -54,7 +54,7 @@ Thu Jan 30 19:02:14 +0100 2003 - agruen@suse.de
   patch,
 
 -------------------------------------------------------------------
-Thu Jan 20 12:11:00 +0500 2003 -  Martin.Quinson@ens-lyon.fr
+Thu Jan 30 12:11:00 +0500 2003 -  Martin.Quinson@ens-lyon.fr
 
 - Remove useless oldies. Missing functionnalities needs to be
   reimplemented almost from the scratch due to the bunch of
diff --git a/quilt.spec.in b/quilt.spec.in
index 589eb0e..ca2a3db 100644
--- a/quilt.spec.in
+++ b/quilt.spec.in
@@ -33,7 +33,7 @@ fi
 %setup
 
 %build
-configure
+./configure
 make prefix=/usr BUILD_ROOT=$RPM_BUILD_ROOT
 
 %install
@@ -45,6 +45,7 @@ make install prefix=/usr BUILD_ROOT=$RPM_BUILD_ROOT
 /usr/bin/quilt
 
 /usr/share/quilt/
+/usr/lib/quilt/
 
 %doc /usr/share/man/man1/guards.1.gz
 %doc doc/README