From ef16cccdd44d926b93303d5b3f3483dc5c449509 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 9 Aug 2016 21:52:40 +0100 Subject: [PATCH] Makefile: Use lowercase `distdir'. It's conventional, and `mdw-build' relies on this convention. --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 31b10dc..d80a97c 100644 --- a/Makefile +++ b/Makefile @@ -65,44 +65,44 @@ install: all clean: $(RM) -f *.o *.so pkgIndex.tcl -DISTDIR = $(PACKAGE)-$(VERSION) +distdir = $(PACKAGE)-$(VERSION) DISTFILES = \ COPYING README Makefile $(SRCFILES) elite.tcl steele.cmdr \ elite.def vec.def graph.def $(TCLSCRIPTS) \ debian/rules debian/control debian/copyright debian/changelog distdir: $(DISTFILES) - $(RM) -rf $(DISTDIR) - mkdir $(DISTDIR) $(DISTDIR)/debian + $(RM) -rf $(distdir) + mkdir $(distdir) $(distdir)/debian for i in $(DISTFILES); do \ case $$i in \ */*) \ dir=$${i%/*}; \ up=`echo $$dir | sed 's:[^/]\+:..:g'`; \ - mkdir -p $(DISTDIR)/$$dir;; \ + mkdir -p $(distdir)/$$dir;; \ *) dir= up=;; \ esac; \ - ln -s ../$$up/$$i $(DISTDIR)/$$i; \ + ln -s ../$$up/$$i $(distdir)/$$i; \ done disttar: distdir - tar chofz $(INST)$(DISTDIR).tar.gz $(DISTDIR) + tar chofz $(INST)$(distdir).tar.gz $(distdir) distzip: distdir - cd $(DISTDIR) && zip -rq ../$(INST)$(DISTDIR).zip . + cd $(distdir) && zip -rq ../$(INST)$(distdir).zip . dist: disttar distzip - $(RM) -rf $(DISTDIR) + $(RM) -rf $(distdir) distcheck: dist @echo "*** Packing..." $(MAKE) dist @echo "*** Unpacking..." - tar xfz $(DISTDIR).tar.gz + tar xfz $(distdir).tar.gz @echo "*** Test building..." set -e; \ - cd $(DISTDIR); \ + cd $(distdir); \ $(MAKE) clean; \ $(MAKE); \ $(MAKE) install INST=inst; \ $(MAKE) dist @echo "*** Tidying up..." - rm -rf $(DISTDIR) + rm -rf $(distdir) @echo "*** All OK" .PHONY: all install clean dist disttar distzip distdir distcheck -- 2.11.0