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

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/06/20 22:19:12

Modified files:
        contrib/mom    : ChangeLog Makefile.sub 

Log message:
        o Makefile.sub (HTMLDOCFILES_, EXAMPLEFILES_, PROCESSEDEXAMPLEFILES_): 
New
        variables.
        (install_data): Install files in `mom' subdirectories.
        Make it work actually.
        (uninstall_sub): Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/ChangeLog.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/Makefile.sub.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: groff/contrib/mom/ChangeLog
diff -u groff/contrib/mom/ChangeLog:1.33 groff/contrib/mom/ChangeLog:1.34
--- groff/contrib/mom/ChangeLog:1.33    Thu Jun 16 09:45:38 2005
+++ groff/contrib/mom/ChangeLog Mon Jun 20 22:19:11 2005
@@ -1,3 +1,11 @@
+*Mon Jun 20 2005
+
+o Makefile.sub (HTMLDOCFILES_, EXAMPLEFILES_, PROCESSEDEXAMPLEFILES_): New
+  variables.
+  (install_data): Install files in `mom' subdirectories.
+  Make it work actually.
+  (uninstall_sub): Updated.
+
 *Thu Jun 16 2005
 
 o Makefile.sub (install_data, uninstall_sub): Use $(exampledir) for example
Index: groff/contrib/mom/Makefile.sub
diff -u groff/contrib/mom/Makefile.sub:1.20 groff/contrib/mom/Makefile.sub:1.21
--- groff/contrib/mom/Makefile.sub:1.20 Thu Jun 16 09:45:38 2005
+++ groff/contrib/mom/Makefile.sub      Mon Jun 20 22:19:11 2005
@@ -76,6 +76,10 @@
   examples/sample_docs.ps \
   examples/typesetting.ps
 
+HTMLDOCFILES_=`echo $(HTMLDOCFILES) | sed 's|momdoc/||g'`
+EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'`
+PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'`
+
 CLEANADD=\
   penguin.ps \
   $(PROCESSEDEXAMPLEFILES) \
@@ -104,29 +108,30 @@
          rm -f $(tmacdir)/$$f; \
          $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
        done
-       -test -d $(htmldocdir)/momdoc || $(mkinstalldirs) $(htmldocdir)/momdoc
-       for f in $(HTMLDOCFILES); do \
-         rm -f $(htmldocdir)/$$f; \
-         $(INSTALL_DATA) $(srcdir)/$$f $(htmldocdir)/$$f; \
-       done
-       -test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
-       for f in $(EXAMPLEFILES); do \
-         rm -f $(exampledir)/$$f; \
-         $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
-       done
-       for f in $(PROCESSEDEXAMPLEFILES); do \
-         rm -f $(exampledir)/$$f; \
-         $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+       -test -d $(htmldocdir)/mom || $(mkinstalldirs) $(htmldocdir)/mom
+       for f in $(HTMLDOCFILES_); do \
+         rm -f $(htmldocdir)/mom/$$f; \
+         $(INSTALL_DATA) $(srcdir)/momdoc/$$f $(htmldocdir)/mom/$$f; \
+       done
+       -test -d $(exampledir)/mom || $(mkinstalldirs) $(exampledir)/mom
+       for f in $(EXAMPLEFILES_); do \
+         rm -f $(exampledir)/mom/$$f; \
+         $(INSTALL_DATA) $(srcdir)/examples/$$f $(exampledir)/mom/$$f; \
+       done
+       for f in $(PROCESSEDEXAMPLEFILES_); do \
+         rm -f $(exampledir)/mom/$$f; \
+         $(INSTALL_DATA) examples/$$f $(exampledir)/mom/$$f; \
        done
 
 uninstall_sub:
        -for f in $(NORMALFILES); do \
          rm -f $(tmacdir)/$$f; \
        done
-       -for f in $(HTMLDOCFILES); do \
-         rm -f $(htmldocdir)/$$f; \
+       -for f in $(HTMLDOCFILES_); do \
+         rm -f $(htmldocdir)/mom/$$f; \
        done
-       -rmdir $(htmldocdir)/momdoc
-       -for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \
-         rm -f $(exampledir)/$$f; \
+       -rmdir $(htmldocdir)/mom
+       -for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_); do \
+         rm -f $(exampledir)/mom/$$f; \
        done
+       -rmdir $(exampledir)/mom