Changeset 125 for trunk

Timestamp:

Sep 10, 2007, 11:50:51 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #80 ('make deb' fails with --with-config-file).

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• docs/Changelog (modified) (1 diff)

trunk/Makefile.in

@@ -856 +856 @@
         echo "Index: /usr/share/doc/@install_name@/manual.html/index.html" >> debian/@install_name@.doc-base; \
         echo "Files: /usr/share/doc/@install_name@/manual.html/*.html" >> debian/@install_name@.doc-base; \
-        echo $(sysconfdir)/@install_name@rc > debian/conffiles; \
+        echo @myrpmconffile@ > debian/conffiles; \
         echo /etc/init.d/@install_name@ >> debian/conffiles; \
         if test -f /usr/lib/lsb/install_initd; then \

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.7:
+        * Makefile.in: fix 'make deb' target, wrong name of config file
+          written to debian/conffiles (reported by marc)
         * configure.ac: fix incorrect order of with-prelude, enable-static
           (libprelude test was always without -static)