From 991c3391ed19dc49e10a395683f3b000f0444e42 Mon Sep 17 00:00:00 2001
From: Don Stewart <dons@cse.unsw.edu.au>
Date: Sun, 15 May 2005 07:58:45 +0000
Subject: [PATCH] And fix installation

---
 src/altdata/Makefile |  1 +
 src/build.mk         | 16 +++++++---------
 src/hi/Makefile      |  2 ++
 src/plugins/Makefile |  2 ++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/altdata/Makefile b/src/altdata/Makefile
index 9cdecd2..e4d9d09 100644
--- a/src/altdata/Makefile
+++ b/src/altdata/Makefile
@@ -1,5 +1,6 @@
 PKG			= altdata
 UPKG			= AltData
+PATHS                   = AltData
 
 ALL_SRCS=$(wildcard $(patsubst ./%, %, $(patsubst %, %/*.hs, . $(UPKG))))
 
diff --git a/src/build.mk b/src/build.mk
index a0854a5..b6e5b21 100644
--- a/src/build.mk
+++ b/src/build.mk
@@ -95,15 +95,13 @@ $(PKG).conf.in : $(PKG).conf.in.cpp
 #
 .PHONY: install install-me
 install-me:
-	$(INSTALL_DATA_DIR) $(LIBDIR)/imports/$(UPKG)
-	@for i in $(TOP)/src/$(PKG)/*.$(way_)hi ; do \
-		echo $(INSTALL_DATA) $$i $(LIBDIR)/imports/ ; \
-		$(INSTALL_DATA) $$i $(LIBDIR)/imports/ ; \
-	done
-	@for i in $(TOP)/src/$(PKG)/$(UPKG)/*.$(way_)hi ; do \
-		echo $(INSTALL_DATA) $$i $(LIBDIR)/imports/$(UPKG)/ ; \
-		$(INSTALL_DATA) $$i $(LIBDIR)/imports/$(UPKG)/ ; \
-	done
+	@for i in $(PATHS) ; do \
+	        $(INSTALL_DATA_DIR) $(LIBDIR)/imports/$$i ;\
+                for j in $(TOP)/src/$(PKG)/$$i/*.$(way_)hi ; do \
+                        echo $(INSTALL_DATA) $$j $(LIBDIR)/imports/$$i/ ; \
+                        $(INSTALL_DATA) $$j $(LIBDIR)/imports/$$i/ ; \
+                done ;\
+        done
 	$(INSTALL_DATA) $(TOP)/src/$(PKG)/libHS$(PKG)$(_way).a  $(LIBDIR)
 	$(RANLIB) $(LIBDIR)/libHS$(PKG).a
 	$(INSTALL_DATA) $(TOP)/src/$(PKG)/HS$(PKG).o     $(LIBDIR)
diff --git a/src/hi/Makefile b/src/hi/Makefile
index d2438de..0698b30 100644
--- a/src/hi/Makefile
+++ b/src/hi/Makefile
@@ -4,6 +4,8 @@ UPKG	= Hi
 CSRC  = Language/$(UPKG)/hschooks.c
 COBJ  = Language/$(UPKG)/hschooks.o
 
+PATHS = Language Language/$(UPKG)
+
 ALL_SRCS=$(wildcard $(patsubst ./%, %, $(patsubst %, %/*.hs, Language Language/$(UPKG))))
 
 TOP=../..
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index 86a21ca..454f8cd 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -1,6 +1,8 @@
 PKG         = plugins
 UPKG        = Plugins
 
+PATHS       = System System/Eval System/Plugins
+
 TOP=../..
 include $(TOP)/config.mk