From: Richard Kreckel <kreckel@ginac.de>
Date: Tue, 26 Oct 2004 22:23:41 +0000 (+0000)
Subject:         * cln.pc.in: Fix typo.
X-Git-Tag: cln_1-1-9~6
X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=commitdiff_plain;h=337a21d2e0071cac391ab5bac68ccb1bc667246b;p=cln.git

    * 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 a472ea7..65cceee 100644
--- 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 2337cd0..a3b43df 100644
--- 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 0ff9261..bacb801 100644
--- 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 1fb06a8..315646d 100644
--- 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