Mercurial > hg > early-roguelike
changeset 225:4f6e056438eb
Merge the GCC5 and build fix branches.
| author | John "Elwin" Edwards |
|---|---|
| date | Wed, 02 Mar 2016 21:28:34 -0500 |
| parents | 4d0f53998e8a (diff) f54901b9c39b (current diff) |
| children | b922f66acf4d |
| files | |
| diffstat | 20 files changed, 283 insertions(+), 6050 deletions(-) [+] |
line wrap: on
line diff
--- a/arogue5/Makefile.in Wed Mar 02 21:13:26 2016 -0500 +++ b/arogue5/Makefile.in Wed Mar 02 21:28:34 2016 -0500 @@ -54,7 +54,7 @@ CC = gcc CPPFLAGS =@DEFS@ CFLAGS= -CRLIB = -lcurses +CRLIB = @LIBS@ RM = rm -f TAR = tar INSTALL=@INSTALL@ @@ -75,14 +75,17 @@ 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 \ - $(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) + 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) ; \ @@ -92,17 +95,17 @@ chmod 0464 $(DESTDIR)$(SCOREFILE) ; \ chmod 0464 $(DESTDIR)$(LOGFILE) ; \ chmod 0775 $(DESTDIR)$(SAVEDIR) ; \ - fi - -if test ! -d $(DESTDIR)$(docdir) ; \ + fi + 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)