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.

arogue5/Makefile.in

@@ -75,14 +75,17 @@ lint:
 	lint -hxbc $(CFILES) $(CRLIB) > linterrs
 
 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 \
+	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 \
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
 	    mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	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) ; \
@@ -93,15 +96,15 @@ install: $(PROGRAM)
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) -r $(DESTDIR)$(docdir)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
 
 reinstall: uninstall install
 

arogue7/Makefile.in

@@ -89,18 +89,21 @@ docs: $(DOCS)
 $(PROGRAM).doc: aguide.mm
 	if test "x$(GROFF)" != "x" ; then \
 	$(GROFF) -P-c -P-b -P-u -t -mm -Tascii aguide.mm > $(PROGRAM).doc ;\
-	elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(TBL)" != "x" && test "x$(COLCRT)" != "x" ; then \
 	$(TBL) aguide.mm | $(NROFF) -mm | $(COLCRT) - > $(PROGRAM).doc ;\
 	fi
 
-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: 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 \
+	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) ; \
@@ -112,15 +115,15 @@ install: $(PROGRAM)
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 $(DOCS) $(DOCSRC) $(DESTDIR)$(docdir)
+	$(RM) test
 
 uninstall:
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) -r $(DESTDIR)$(docdir)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
 
 reinstall: uninstall install
 

rogue3/Makefile.in

@@ -49,8 +49,9 @@ CFILES= vers.c armor.c chase.c command.c daemon.c daemons.c fight.c \
 MISC_C=
 DOCSRC= rogue.6 rogue.r
 DOCS  = $(PROGRAM).doc $(PROGRAM).cat
-MISC  =	Makefile $(MISC_C) LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj $(DOCS)\
-	$(DOCSRC) rogue36.html readme36.html
+RAWDOCS = LICENSE.TXT rogue36.html readme36.html
+MISC  =	Makefile $(MISC_C) $(PROGRAM).sln $(PROGRAM).vcproj $(RAWDOCS) $(DOCS)\
+	$(DOCSRC)
 
 CC    = gcc
 CPPFLAGS =@DEFS@
@@ -88,26 +89,29 @@ docs: $(DOCS)
 $(PROGRAM).doc: rogue.r
 	if test "x$(GROFF)" != "x" ; then \
 	$(GROFF) -P-c -P-b -P-u -t -ms -Tutf8 rogue.r > $(PROGRAM).doc ;\
-	elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(TBL)" != "x" && test "x$(COLCRT)" != "x" ; then \
 	$(TBL) rogue.r | $(NROFF) -ms | $(COLCRT) - > $(PROGRAM).doc ;\
 	fi
 
 $(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
 
-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: 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 \
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
 	    mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	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) ; \
@@ -118,25 +122,21 @@ install: $(PROGRAM)
 	    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) ; \
+	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.r $(DESTDIR)$(docdir)/$(PROGRAM).r
-	-$(INSTALL) -m 0644 $(PROGRAM).doc $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(INSTALL) -m 0644 $(PROGRAM).cat $(DESTDIR)$(docdir)/$(PROGRAM).cat
-	-$(RM) test
+	$(INSTALL) -m 0644 rogue.r $(DESTDIR)$(docdir)/$(PROGRAM).r
+	$(INSTALL) -m 0644 $(DOCS) $(RAWDOCS) $(DESTDIR)$(docdir)
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).r
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).cat
-	-$(RMDIR) $(DESTDIR)$(docdir)$(PROGRAM)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6
+	$(RM) $(DESTDIR)$(mandir)/$(PROGRAM).6
+	$(RM) -r $(DESTDIR)$(docdir)
     
 reinstall: uninstall install
 

rogue4/Makefile.in

@@ -112,14 +112,14 @@ docs: $(DOCS)
 $(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 @@ maintainer-clean:
 	$(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: 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 \
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
 	    $(MKDIR) -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(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) ; \
@@ -152,30 +155,28 @@ install: $(PROGRAM)
 	    $(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) ; \
+	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
+	$(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
 

rogue5/Makefile.in

@@ -182,7 +182,7 @@ scmisc.o scedit.o:
 $(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$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(TBL)" != "x" && test "x$(COLCRT)" != "x" ; then \
         tbl rogue.me | $(NROFF) -me | colcrt - > $(PROGRAM).doc ;\
 	fi
 
@@ -194,7 +194,7 @@ $(PROGRAM).doc: rogue.me
 $(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
 
@@ -203,13 +203,17 @@ dist: clean $(PROGRAM)
 	gzip -f $(DISTFILE).tar
 
 install: all
-	-$(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 \
+	$(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 \
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
 	    $(MKDIR) -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(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) ; \
@@ -220,27 +224,27 @@ install: all
 	    $(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
-	-$(INSTALL) -m 0644 $(PROGRAM).doc $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(INSTALL) -m 0644 rogue.html $(DESTDIR)$(docdir)/$(PROGRAM).html
-	-$(INSTALL) -m 0644 $(PROGRAM).cat $(DESTDIR)$(docdir)/$(PROGRAM).cat
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me
-	-if test "x$(LOCKFILE)" != "x" && test ! -f $(DESTDIR)$(LOCKFILE) ; then \
+	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
+	$(MKDIR) -p $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
+	$(INSTALL) -m 0644 rogue.html $(DESTDIR)$(docdir)/$(PROGRAM).html
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me
+	if test "x$(LOCKFILE)" != "x" && test ! -f $(DESTDIR)$(LOCKFILE) ; then \
             $(INSTALL) -m 0666 test $(DESTDIR)$(LOCKFILE)  ; \
             $(RM) $(DESTDIR)$(LOCKFILE) ; \
         fi
-	-$(RM) test
+	$(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)$(docdir)/$(PROGRAM).html
-	-$(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

srogue/Makefile.in

@@ -76,19 +76,22 @@ docs: $(DOCS)
 $(PROGRAM).doc: rogue.nr
 	if test "x$(GROFF)" != "x" ; then \
 	$(GROFF) -P-c -P-b -P-u -t -mm -Tascii rogue.nr >$(PROGRAM).doc ;\
-	elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \
+	elif test "x$(NROFF)" != "x" && test "x$(TBL)" != "x" && test "x$(COLCRT)" != "x" ; then \
 	$(TBL) rogue.nr | $(NROFF) -mm | $(COLCRT) - > $(PROGRAM).doc ;\
 	fi
 
-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: 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 \
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
 	    mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	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) ; \
@@ -99,19 +102,16 @@ install: $(PROGRAM)
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 rogue.nr $(DESTDIR)$(docdir)/$(PROGRAM).nr
-	-$(INSTALL) -m 0644 $(PROGRAM).doc $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 rogue.nr $(DESTDIR)$(docdir)/$(PROGRAM).nr
+	$(INSTALL) -m 0644 $(PROGRAM).doc $(DESTDIR)$(docdir)/$(PROGRAM).doc
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).nr
-	-$(RM) $(DESTDIR)$(docdir)/$(PROGRAM).doc
-	-rmdir $(DESTDIR)$(docdir)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
 
 reinstall: uninstall install
 

xrogue/Makefile.in

@@ -66,13 +66,16 @@ $(PROGRAM): $(HDRS) $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 
 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 \
+	touch test
+	if test ! -f $(DESTDIR)$(SCOREFILE) ; then \
+	    mkdir -p `dirname $(DESTDIR)$(SCOREFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
+	if 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 \
+	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) ; \
@@ -84,15 +87,14 @@ install: $(PROGRAM)
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 README.TXT $(DESTDIR)$(docdir)
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT README.TXT $(DESTDIR)$(docdir)
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) -r $(DESTDIR)$(docdir)
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
 
 reinstall: uninstall install