Re: [bug-gnubatch] Re: Attempt to fix various issues

[Jan Schampera]

Jan Schampera wrote:

> The "datarootdir" problem seems to be fixed, still various other errors 
> on 'make install'. I'll have a look at the AM definitions.

Correction: Of course only AC definitions and Makefile.in's. No AM used 
here :)

Anyways, attached is a patch (diff -Nur) that fixes
a) lib/ directory creation in destination
b) man directories creation in destination
c) manpage symlinking in destination (now one can re-run make install)

What it does NOT fix for now is the installation into PDFDIR. PDFDIR in 
doc/Makefile.in doesn't seem to be set, I'll have to find out why :D

Do you consider switching to Automake one day? Not really necessary 
here, but smart.


Jan "TheBonsai"

--- gnubatch.orig/src/lib/Makefile.in   2010-09-11 11:17:50.243704000 +0200
+++ gnubatch/src/lib/Makefile.in        2010-09-11 12:02:29.179702689 +0200
@@ -81,6 +81,7 @@
        libtool --mode=link @CC@ $(CCFLAGS) -o $(LIBCURS) $(LIBCURSOBJS) -rpath 
$(RPATH) -version-info 0:0:0
 
 install: all
+       $(INSTALL) -d $(LIBDIR)
        libtool --mode=install $(INSTALL) $(LIB) $(LIBDIR)
        libtool --mode=install $(INSTALL) $(LIBCLIENT) $(LIBDIR)
        libtool --mode=install $(INSTALL) $(LIBCURS) $(LIBDIR)
@@ -88,6 +89,7 @@
        $(INSTALL_DATA) $(LIB) $(LIBCLIENT) $(LIBCURS) $(LIBDIR)
 
 install_strip:
+       $(INSTALL) -d $(LIBDIR)
        libtool --mode=install $(INSTALL) -s $(LIB) $(LIBDIR)
        libtool --mode=install $(INSTALL) -s $(LIBCLIENT) $(LIBDIR)
        libtool --mode=install $(INSTALL) -s $(LIBCURS) $(LIBDIR)
--- gnubatch.orig/doc/Makefile.in       2010-09-11 11:17:49.604710000 +0200
+++ gnubatch/doc/Makefile.in    2010-09-11 12:04:48.059707830 +0200
@@ -39,14 +39,15 @@
        # Currently don't do anything
 
 install install-strip: all
+       $(INSTALL) -d $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man5 
$(MANDIR)/man8
        $(INSTALL_DATA) poddoc/man/*.1 $(MANDIR)/man1
        $(INSTALL_DATA) poddoc/man/*.3 $(MANDIR)/man3
        $(INSTALL_DATA) poddoc/man/*.5 $(MANDIR)/man5
        $(INSTALL_DATA) poddoc/man/*.8 $(MANDIR)/man8
-       cd $(MANDIR)/man1; for p in $(STARTLINKS); do ln -s gbch-start.1 
gbch-$$p.1; done
-       cd $(MANDIR)/man3; ln -s gbatch_jobfind.3 gbatch_jobfindslot.3
-       cd $(MANDIR)/man3; ln -s gbatch_varfind.3 gbatch_varfindslot.3
-       cd $(MANDIR)/man8; ln -s gbch-hostedit.8 gbch-xhostedit.8
+       cd $(MANDIR)/man1; for p in $(STARTLINKS); do ln -fs gbch-start.1 
gbch-$$p.1; done
+       cd $(MANDIR)/man3; ln -fs gbatch_jobfind.3 gbatch_jobfindslot.3
+       cd $(MANDIR)/man3; ln -fs gbatch_varfind.3 gbatch_varfindslot.3
+       cd $(MANDIR)/man8; ln -fs gbch-hostedit.8 gbch-xhostedit.8
        $(INSTALL) -d $(PDFDIR)
        $(INSTALL_DATA) pdf/*.pdf $(PDFDIR)