Mercurial > hg > early-roguelike

diff rogue4/Makefile.in @ 224:4d0f53998e8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile fixes related to installation. 'make install' and 'make uninstall' should now work correctly, placing the documentation in the proper places. Any directories needed will be created.
author John "Elwin" Edwards
date Fri, 26 Feb 2016 17:30:30 -0500
parents 0e99eade579c
children bac2c81fec78
line wrap: on
line diff
--- a/rogue4/Makefile.in	Sun Feb 21 20:47:12 2016 -0500
+++ b/rogue4/Makefile.in	Fri Feb 26 17:30:30 2016 -0500
@@ -112,14 +112,14 @@
 $(PROGRAM).cat: rogue.6
 	if test "x$(GROFF)" != "x" ; then \
 	$(GROFF) -P-c -P-b -P-u -Tascii -man rogue.6 > $(PROGRAM).cat ;\
-	elif test "x$(NROFF)" != "x" -a "x$(COLCRT)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(COLCRT)" != "x" ; then \
 	$(NROFF) -man rogue.6 | colcrt - > $(PROGRAM).cat ;\
 	fi
 
 $(PROGRAM).doc: rogue.me
 	if test "x$(GROFF)" != "x" ; then \
 	$(GROFF) -P-c -P-b -P-u -t -me -Tutf8 rogue.me > $(PROGRAM).doc ;\
-	elif test "x$(NROFF)" != "x" -a "x$(COLCRT)" != "x" -a "x$(TBL)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(COLCRT)" != "x" && test "x$(TBL)" != "x" ; then \
 	$(TBL) rogue.me | $(NROFF) -me | $(COLCRT) - > $(PROGRAM).doc ;\
 	fi
 
@@ -133,15 +133,18 @@
 	$(RM) $(PROGRAM).scr $(PROGRAM).log $(PROGRAM).lck
 	$(RM) rogue.6 rogue.me
 
-install: $(PROGRAM)
-	-$(TOUCH) test
-	-if test ! -f $(DESTDIR)$(SCOREFILE) ; \
-	 then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
-	-if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
-	$(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
-	-if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
-	$(MKDIR) -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+install: all
+	$(TOUCH) test
+	if test ! -f $(DESTDIR)$(SCOREFILE) ; then \
+	    $(MKDIR) -p `dirname $(DESTDIR)$(SCOREFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
+	if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
+	    $(MKDIR) -p `dirname $(DESTDIR)$(LOGFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
+	    $(MKDIR) -p $(DESTDIR)$(SAVEDIR) ; fi
+	$(MKDIR) -p $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
 	-if test "x$(GROUPOWNER)" != "x" ; then \
 	    $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \
 	    $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(LOGFILE) ; \
@@ -151,31 +154,29 @@
 	    $(CHMOD) 0464 $(DESTDIR)$(SCOREFILE) ; \
 	    $(CHMOD) 0464 $(DESTDIR)$(LOGFILE) ; \
 	    $(CHMOD) 0775 $(DESTDIR)$(SAVEDIR) ; \
-         fi
-	-if test -d $(DESTDIR)$(man6dir) ; \
-	 then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi
-	-if test ! -d $(DESTDIR)$(man6dir) ; \
-	 then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(mandir)/$(PROGRAM).6 ; fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+        fi
+	if test ! -d $(DESTDIR)$(man6dir) && test -d $(DESTDIR)$(mandir) ; \
+	    then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(mandir)/$(PROGRAM).6 ; \
+	    else $(MKDIR) -p $(DESTDIR)$(man6dir) ; \
+	    $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then $(MKDIR) -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me
-	-$(INSTALL) -m 0644 $(PROGRAM).doc $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(INSTALL) -m 0644 $(PROGRAM).cat $(DESTDIR)$(docdir)/$(PROGRAM).cat
-	-if test "x$(LOCKFILE)" != "x" && test ! -f $(DESTDIR)$(LOCKFILE) ; then \
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me
+	$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
+	if test "x$(LOCKFILE)" != "x" && test ! -f $(DESTDIR)$(LOCKFILE) ; then \
 	    $(INSTALL) -m 0666 test $(DESTDIR)$(LOCKFILE)  ; \
 	    $(RM) $(DESTDIR)$(LOCKFILE) ; \
-	 fi
-	-$(RM) test
+	fi
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).cat
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).me
-	-$(RM) $(DESTDIR)$(LOCKFILE)
-	-$(RMDIR) $(DESTDIR)$(docdir)$(PROGRAM)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6
+	$(RM) $(DESTDIR)$(mandir)/$(PROGRAM).6
+	$(RM) -r $(DESTDIR)$(docdir)
+	if test "x$(LOCKFILE)" != "x" ; then \
+	    $(RM) $(DESTDIR)$(LOCKFILE) ; fi
     
 reinstall: uninstall install