* cln.pc.in: Fix typo.

        * Makefile.in (INSTALL_SCRIPT): Added, to be used for scripts like
        cln-config.  Allows us to do special things to binaries, like
        installing them with install -s.
        * doc/Makefile.in: add/remove the cln.info from the installed
        $(infodir)/dir unless this is debian install-info (code copied from
        what GNU automake would produce).

diff --git a/ChangeLog b/ChangeLog
index a472ea753840bf81b8e81d819cab0b65ddcb51b4..65cceeedad7654794188d2d62176009e1ab4b7cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+       * cln.pc.in: Fix typo.
+       * Makefile.in (INSTALL_SCRIPT): Added, to be used for scripts like
+       cln-config.  Allows us to do special things to binaries, like
+       installing them with install -s.
+       * doc/Makefile.in: add/remove the cln.info from the installed
+       $(infodir)/dir unless this is debian install-info (code copied from
+       what GNU automake would produce).
+
 2004-10-26  Richard B. Kreckel  <kreckel@ginac.de>
 
        * src/integer/input/cl_I_read_stream.cc (read_integer): Fix a bug

diff --git a/Makefile.in b/Makefile.in
index 2337cd01dfec37059d253333f1530e509b694e9c..a3b43dffed6dbff5c259e294438ed5c82120a94f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,8 @@ MKDIR = mkdir -p
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
-UNINSTALL_PROGRAM = @UNINSTALL_PROGRAM@
 
 #### End of system configuration section. ####
 
@@ -34,7 +34,7 @@ all : force
 
 install : installdirs force
        cd @subdir@; $(MAKE) install
-       $(INSTALL_PROGRAM) cln-config $(DESTDIR)$(bindir)/cln-config
+       $(INSTALL_SCRIPT) cln-config $(DESTDIR)$(bindir)/cln-config
        $(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1
        $(INSTALL_DATA) ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4
        $(INSTALL_DATA) cln.pc $(DESTDIR)$(libdir)/pkgconfig/cln.pc

diff --git a/cln.pc.in b/cln.pc.in
index 0ff9261fe3b4e998cd4b2ae2825f62cff9642f8f..bacb8012182755d80be5767be5f24c8a48a96a4f 100644 (file)
--- a/cln.pc.in
+++ b/cln.pc.in
@@ -7,4 +7,4 @@ Name: cln
 Description: Class Library for Numbers
 Version: @CL_VERSION@
 Libs: -L${libdir} -lcln @LIBS@
-Cflags: -I${includedir} @CPPFLAGS
+Cflags: -I${includedir} @CPPFLAGS@

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1fb06a87506315235d565d46880399d848a406c2..315646df84e742dfce1f8417ee1b918202d3a731 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -81,6 +81,11 @@ $(PACKAGE)_toc.html : $(srcdir)/$(PACKAGE).texi
 
 install : all installdirs force
        $(INSTALL_DATA) $(srcdir)/$(PACKAGE).info $(DESTDIR)$(infodir)/$(PACKAGE).info
+       @if (install-info --version && \
+            install-info --version 2>&1 | sed 1q | fgrep -i -v debian) >/dev/null 2>&1; then \
+         echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info";\
+         install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info || :;\
+       else : ; fi
        $(INSTALL_DATA) $(srcdir)/$(PACKAGE)_*.html $(DESTDIR)$(htmldir)
        $(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi
 
@@ -91,6 +96,11 @@ installdirs : force
        $(MKDIR) $(DESTDIR)$(dvidir)
 
 uninstall : force
+       @if (install-info --version && \
+            install-info --version 2>&1 | sed 1q | fgrep -i -v debian) >/dev/null 2>&1; then \
+         echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(PACKAGE).info"; \
+         install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(PACKAGE).info; \
+       else :; fi
        $(RM) $(DESTDIR)$(infodir)/$(PACKAGE).info
        $(RM) $(DESTDIR)$(htmldir)/$(PACKAGE)_*.html
        $(RM) $(DESTDIR)$(dvidir)/$(PACKAGE).dvi