[Groff-commit] groff/contrib/chem ChangeLog Makefile.sub

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/11/06 23:33:38

Modified files:
        contrib/chem   : ChangeLog Makefile.sub 

Log message:
        * Makefile: Add and fix $(srcdir) where necessary to make
        it compile with srcdir != builddir.
        Other minor fixes improvements.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/ChangeLog?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/Makefile.sub?cvsroot=groff&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ChangeLog   6 Nov 2006 23:17:25 -0000       1.3
+++ ChangeLog   6 Nov 2006 23:33:38 -0000       1.4
@@ -1,3 +1,9 @@
+2006-11-07  Werner LEMBERG  <address@hidden>
+
+       * Makefile: Add and fix $(srcdir) where necessary to make
+       it compile with srcdir != builddir.
+       Other minor fixes improvements.
+
 2006-11-07  Bernd Warken
        ________________________________________________________________
         * release of chem 0.1.2

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/Makefile.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile.sub        26 Oct 2006 22:13:49 -0000      1.1
+++ Makefile.sub        6 Nov 2006 23:33:38 -0000       1.2
@@ -36,16 +36,14 @@
 
 all: README examples/README chem $(MAN1)
 
-README: README.txt
-       sed -e "s|@g@|$(g)|g" $(srcdir)/README.txt >$@
+README: $(srcdir)/README.txt
+       sed -e "s|@g@|$(g)|g" $< >$@
 
-examples/README: examples/README.txt
-       if test -d examples; then :; else \
-         $(mkinstalldirs) examples; \
-       fi
-       sed -e "s|@g@|$(g)|g" $(srcdir)/examples/README.txt >$@
+examples/README: $(srcdir)/examples/README.txt
+       if test -d examples || $(mkinstalldirs) examples
+       sed -e "s|@g@|$(g)|g" $< >$@
 
-chem: chem.pl $(SH_DEPS_SED_SCRIPT)
+chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
            -e "s|@g@|$(g)|g" \
            -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
@@ -53,48 +51,47 @@
            -e "s|@VERSION@|$(version)$(revision)|g" \
            -e "$(SH_SCRIPT_SED_CMD)" \
            $(srcdir)/chem.pl >$@
-       chmod a+x $@
+       chmod +x $@
 
-install_data: chem macros.pic pic.tmac $(MAN1) README \
-       examples/*.chem examples/README examples/122/*
-       address@hidden -d $(DESTDIR)$(bindir) || \
-         $(mkinstalldirs) $(DESTDIR)$(bindir)
-       address@hidden(RM) $(DESTDIR)$(bindir)/$(g)chem
+install_data: chem \
+              README examples/README \
+              $(srcdir)/macros.pic $(srcdir)/pic.tmac \
+              $(srcdir)/examples/*.chem $(srcdir)/examples/122/*
+       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(bindir)/$(g)chem
        $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
-       address@hidden -d $(DESTDIR)$(chem_libdir) || \
-          $(mkinstalldirs) $(DESTDIR)$(chem_libdir)
-       address@hidden(RM) $(DESTDIR)$(chem_libdir)/macros.pic
+       -test -d $(DESTDIR)$(chem_libdir) \
+          || $(mkinstalldirs) $(DESTDIR)$(chem_libdir)
+       $(RM) $(DESTDIR)$(chem_libdir)/macros.pic
        $(INSTALL_DATA) $(srcdir)/macros.pic \
          $(DESTDIR)$(chem_libdir)/macros.pic
-       address@hidden(RM) $(DESTDIR)$(chem_libdir)/pic.tmac
+       $(RM) $(DESTDIR)$(chem_libdir)/pic.tmac
        $(INSTALL_DATA) $(srcdir)/pic.tmac \
          $(DESTDIR)$(chem_libdir)/pic.tmac
-       address@hidden -d $(DESTDIR)$(exampledir)/chem || \
-          $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
-       address@hidden -d $(DESTDIR)$(exampledir)/chem/122 || \
-          $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
-       address@hidden(RM) $(DESTDIR)$(exampledir)/chem/*
+       -test -d $(DESTDIR)$(exampledir)/chem \
+          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+       -test -d $(DESTDIR)$(exampledir)/chem/122 \
+          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+       -$(RM) $(DESTDIR)$(exampledir)/chem/*
        $(INSTALL_DATA) examples/README \
          $(DESTDIR)$(exampledir)/chem/README
-       for i in examples/*.chem; do \
-         n=`echo $$i | sed 's|examples/||g'`; \
-         $(INSTALL_DATA) $(srcdir)/$$i \
-           $(DESTDIR)$(exampledir)/chem/$$n; \
+       for i in $(srcdir)/examples/*.chem; do \
+          n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
+          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
        done
-       address@hidden(RM) $(DESTDIR)$(exampledir)/chem/122/*
-       for i in examples/122/*; do \
-         n=`echo $$i | sed 's|examples/122/||g'`; \
-         $(INSTALL_DATA) $(srcdir)/$$i \
-           $(DESTDIR)$(exampledir)/chem/122/$$n; \
+       -$(RM) $(DESTDIR)$(exampledir)/chem/122/*
+       for i in $(srcdir)/examples/122/*; do \
+          n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
+          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
        done
 
 uninstall_sub:
-       -$(RM) $(DESTDIR)$(bindir)/chem
-       -$(RM) $(DESTDIR)$(libdir)/groff/chem/macros.pic
+       $(RM) $(DESTDIR)$(bindir)/chem
+       $(RM) $(DESTDIR)$(libdir)/groff/chem/macros.pic
        -rmdir $(DESTDIR)$(libdir)/groff/chem
-       -$(RM) $(DESTDIR)$(exampledir)/chem/122/*
+       $(RM) $(DESTDIR)$(exampledir)/chem/122/*
        -rmdir $(DESTDIR)$(exampledir)/chem/122
-       -$(RM) $(DESTDIR)$(exampledir)/chem/*
+       $(RM) $(DESTDIR)$(exampledir)/chem/*
        -rmdir $(DESTDIR)$(exampledir)/chem
        -rmdir $(DESTDIR)$(exampledir)