[project @ 1998-04-16 10:03:50 by sof]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 10c622f..5c4baa2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,18 +55,19 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 
 binary-dist::
        @for i in $(BIN_DIST_TOP); do \
-         if [ -e $$i ]; then \
+         if test -f "$$i"; then \
             echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
             cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
          fi; \
        done;
        @echo "Configuring the Makefile for this project..."
        touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "project = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        @echo "Generating a shippable configure script.."
        $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
@@ -82,12 +83,12 @@ BINDIST_DOCS_WAYS = html info dvi
 
 binary-dist ::
        @for way in $(BINDIST_DOCS_WAYS); do \
-          $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion); \
+          $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(ProjectNameShort)-$(ProjectVersion); \
           for dir in $(BINDIST_DOCS); do \
             echo Making $$way documentation in $$dir && \
             $(MAKE) -C $$dir --no-print-directory $(MFLAGS) $$way && \
-            echo cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion) && \
-            cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion) && \
+            echo cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(ProjectNameShort)-$(ProjectVersion) && \
+            cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(ProjectNameShort)-$(ProjectVersion) && \
             echo "Done."; \
           done; \
        done
@@ -95,19 +96,29 @@ binary-dist ::
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
 
+ifneq "$($(Project)BinDistPrlScripts)" ""
 binary-dist::
        @for i in $($(Project)BinDistPrlScripts); do \
             echo "Renaming $$i to $$i.prl"; \
            $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
        done
+endif
+
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
+binary-dist::
        @for i in $($(Project)BinDistLibPrlScripts); do \
             echo "Renaming $$i to $$i.prl"; \
            $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
        done
-       @for i in $($(Project)BinDistLibShScripts); do \
+endif
+
+ifneq "$($(Project)BinDistShScripts)" ""
+binary-dist::
+       @for i in $($(Project)BinDistShScripts); do \
             echo "Renaming $$i to $$i.sh"; \
            $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.sh; \
        done
+endif
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk