Re: [AD] [PATCH] Installation of info files [3.9.25]

[Gary Simmons <darshu@xxxxxxxxxx>]

> Not all Unixes are Linux, and X Allegro should work on every Unix system, 
> even ones that don't have lots of GNU tools installed. Of course if they 
> don't have gzip, chances are they don't have any of the texinfo tools 
> either, but it is possible, so it is safer not to do this.

True, I have made separate targets for a compressed and uncompressed
version... and removed the info install from the main installation, it
just echoes reminding you to install it if you should so choose.

> Are you going to make up a new patch with these changes in place, or should 
> I try to put it all together at my end?
> --
> Shawn Hargreaves - shawn@xxxxxxxxxx - http://www.talula.demon.co.uk/
> "A binary is barely software: it's more like hardware on a floppy disk."

I just put together a new patch now, this patch will work against stock
3.9.25... It also incorporates my minor fix to the shared library install
so hopefully that will be mroe convient. The one other problem I came
along was that some distros (redhat 6.0 for one) don't seem to link
/usr/local/info/dir to /usr/info/dir... that would not be very useful,
since info seems to only look at the /usr/info/dir one unless otherwise
specified, so I made it create a symbolic link from /usr/local/info/dir to
/usr/info/dir if the dir file does not exist already.

I've gotten my self confused over where to send this now =) So I hope i'm
not being over-generous with my to list.

Any critcisims or suggestions are of course welcome.

--Gary Simmons

--- makefile.in~	Mon Aug  2 17:10:12 1999
+++ makefile.in	Thu Aug  5 19:36:08 1999
@@ -17,6 +17,7 @@
 OBJ = .o

 OBJDIR = obj/unix

 LIBDIR = lib/unix

+INFO_DIR = $(infodir)/dir
 

 ACLOCAL = aclocal

 ACLOCAL_M4 = $(srcdir)/aclocal.m4

@@ -26,6 +27,8 @@
 INSTALL = @INSTALL@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_DATA = @INSTALL_DATA@

+INSTALL_INFO_DIR = /sbin/install-info
+
 transform = @program_transform_name@

 

 CC = @CC@

@@ -216,7 +219,9 @@
 maintainer-clean: veryclean

 	rm -fv configure

 

-install: install-lib install-headers install-programs install-docs

+install: install-lib install-headers install-programs
+	 @echo "Now run make install-info if you wish to install the info documentation"
+	 @echo "Alternatively you may run make install-gzipped-info if you have gzip and wish to conserve space." 
 

 install-lib: lib

 	$(mkinstalldirs) $(libdir)

@@ -231,7 +236,7 @@
 	    echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(libdir); \

 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(libdir)/; \

 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_nonshared.a $(libdir)/; \

-	    $(mksofile) $(libdir) lib$${l}.so lib$${l}-$(shared_version) lib$${l}_nonshared.a; \

+	    $(mksofile) $(libdir) lib$${l}.so lib$${l}-$(shared_version).so lib$${l}_nonshared.a; \
 	  fi; \

 	done

 	$(LDCONFIG) $(libdir)

@@ -254,8 +259,17 @@
 	  fi; \

 	done

 

-install-docs:

-	@echo todo: make this install the info file

+install-info:
+	@if test ! -e $(INFO_DIR); then \
+	  ln -s /usr/info/dir $(INFO_DIR); \
+	fi;
+	@echo Installing Allegro info documentation...
+	@$(INSTALL_DATA) $(srcdir)/docs/allegro.info $(infodir)
+	@$(INSTALL_INFO_DIR) $(infodir)/allegro.info $(INFO_DIR)
+
+install-gzipped-info: install-info
+	@echo Compressing documentation...
+	@gzip -9 -f $(infodir)/allegro.info
 

 makefile.dep: makefile $(srcdir)/makefile.lst $(srcdir)/misc/deplib.sh \

 		$(srcdir)/misc/deplexe.sh $(srcdir)/misc/depnexe.sh \

@@ -279,7 +293,8 @@
 

 .PHONY: default all lib programs docs \

 clean distclean veryclean maintainer-clean \

-install install-lib install-headers install-programs install-docs depend

+install install-lib install-headers install-programs install-info \
+install-gzipped-info depend
 

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.