make distclean purges gpl.txt and fdl.txt
Hello!
I just tried the debian-packaging-rules and found, that when it does the initial distclean, gpl.txt and fdl.txt get lost. IMHO this happens due to them being incorporated in DIST_DOCS in doc/Makefile.in, which is added to CLEANFILES.
Furthermore, the following changes to debian/rules were required to succeed:
--- debian/rules 9 Mar 2005 10:38:51 -0000 1.1 +++ debian/rules 28 Mar 2005 11:54:01 -0000 @@ -28,11 +28,12 @@ CFLAGS += -O2 endif
-config.status: configure +config.status: dh_testdir # Add here commands to configure the package. # FIX are all of these required? - aclocal -I m4 && autoheader && automake && autoconf && CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=$${prefix}/share/man --infodir=$${prefix}/share/info + aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf && CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=$${prefix}/share/man --infodir=$${prefix}/share/info + cd Watchdog ; aclocal-1.9 && autoheader && automake-1.9 && autoconf && CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=$${prefix}/share/man --infodir=$${prefix}/share/info ; cd ..
## Architecture build: build-arch build-indep
Regards, Michael
Thanks for trying to build the packages.
I just tried the debian-packaging-rules and found, that when it does the initial distclean, gpl.txt and fdl.txt get lost. IMHO this happens due to them being incorporated in DIST_DOCS in doc/Makefile.in, which is added to CLEANFILES.
It's also due to their presence in ALL_TARGETS (used by the mostlyclean-local rule).
Roberto, is the patch committed (http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/ppl/doc/Makefile.am.diff?cvsroot=p...) a suitable way to preserve these files?
Furthermore, the following changes to debian/rules were required to succeed:
Thanks, equivalent changes committed.
One remaining issue with the packages is that libppl and the installed GMP need to be compiled with the same version of g++. Perhaps this is OK for now as few people are likely to install libppl. These people can install the g++-3.4 package and then build GMP with the 3.4 g++.
Matthew Mundell wrote:
Roberto, is the patch committed (http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/ppl/doc/Makefile.am.diff?cvsroot=p...) a suitable way to preserve these files?
It is almost OK. But I would prefer LICENSES to include TXT_LICENSES.
Roberto Bagnara bagnara@cs.unipr.it writes:
Matthew Mundell wrote:
Roberto, is the patch committed (http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/ppl/doc/Makefile.am.diff?cvsroot=p...) a suitable way to preserve these files?
It is almost OK. But I would prefer LICENSES to include TXT_LICENSES.
Then how about using PDF_LICENSE and PS_LICENSE in ALL_TARGETS, instead of LICENSES, as follows?
Index: doc/Makefile.am =================================================================== RCS file: /cvs/ppl/ppl/doc/Makefile.am,v retrieving revision 1.33 diff -u -r1.33 Makefile.am --- doc/Makefile.am 29 Mar 2005 14:38:41 -0000 1.33 +++ doc/Makefile.am 29 Mar 2005 16:49:32 -0000 @@ -51,6 +51,7 @@
LICENSES = \ $(PDF_LICENSES) \ +$(TXT_LICENSES) \ $(PS_LICENSES)
HTML_MANUALS = \ @@ -101,7 +102,8 @@
ALL_TARGETS = \ $(HTML_DIRS) \ -$(LICENSES) \ +$(PDF_LICENSES) \ +$(PS_LICENSES) \ $(MANUALS)
Matthew Mundell wrote:
Roberto Bagnara bagnara@cs.unipr.it writes:
It is almost OK. But I would prefer LICENSES to include TXT_LICENSES.
Then how about using PDF_LICENSE and PS_LICENSE in ALL_TARGETS, instead of LICENSES, as follows?
That's great. Thanks!
Roberto
participants (3)
-
Matthew Mundell -
Michael Tautschnig -
Roberto Bagnara