Procházet zdrojové kódy

Small fixes so that a build from a clean checkout works again

Remove origin/Makefile from configure.ac.

Fix debian/rules so that it works even if the auto-generated ChangeLog is
not there yet.

Reported-by: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Raphael Hertzog před 17 roky
rodič
revize
cb42886367
2 změnil soubory, kde provedl 2 přidání a 3 odebrání
  1. 0 1
      configure.ac
  2. 2 2
      debian/rules

+ 0 - 1
configure.ac

@@ -113,7 +113,6 @@ AC_CONFIG_FILES([ Makefile
 		  lib/Makefile
 		  lib/Makefile
 		  lib/test/Makefile
 		  lib/test/Makefile
 		  man/Makefile
 		  man/Makefile
-		  origins/Makefile
 		  po/Makefile.in
 		  po/Makefile.in
 		  scripts/Makefile
 		  scripts/Makefile
 		  scripts/po/Makefile.in
 		  scripts/po/Makefile.in

+ 2 - 2
debian/rules

@@ -89,7 +89,7 @@ binary-arch: install
 	install -d debian/dpkg/sbin
 	install -d debian/dpkg/sbin
 	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 
 
-	dh_installchangelogs -a ChangeLog ChangeLog.old
+	dh_installchangelogs -a ChangeLog*
 	dh_installdocs -a
 	dh_installdocs -a
 	dh_link -a
 	dh_link -a
 	dh_lintian -a
 	dh_lintian -a
@@ -108,7 +108,7 @@ binary-indep: install
 	dh_testroot -i
 	dh_testroot -i
 	dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm
 	dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm
 
 
-	dh_installchangelogs -i ChangeLog ChangeLog.old
+	dh_installchangelogs -i ChangeLog*
 	dh_installdocs -i
 	dh_installdocs -i
 	dh_link -i
 	dh_link -i
 	dh_lintian -i
 	dh_lintian -i