[Gtk2hs-commit] gtk2hs/mk common.mk,1.28,1.29

[Jens-Ulrik P. <ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14863/mk

Modified Files:
	common.mk 
Log Message:
Define INST_HIDIR, INST_LIBDIR, INST_INCLDIR and
INST_BINDIR directly as normal make variables, so that lib
packages get installed in separate subdirs.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- common.mk	27 Jul 2004 08:22:58 -0000	1.28
+++ common.mk	28 Jul 2004 02:40:07 -0000	1.29
@@ -20,15 +20,10 @@
 			/$(patsubst %/,%,$(dir $(INSTALLDIR)/))))
 
 # directories of installation
-INST_HIDIR		?= $(addsuffix $(INSTALLDIROK)/hi,$(libdir))
-INST_LIBDIR		?= $(addsuffix $(INSTALLDIROK),$(libdir))
-INST_INCLDIR		?= $(INST_HIDIR)
-INST_BINDIR		?= $(addsuffix $(INSTALLDIROK),$(bindir))
-
-INST_HIDIR		:= $(shell echo $(INST_HIDIR) | $(SEDPIPE))
-INST_LIBDIR		:= $(shell echo $(INST_LIBDIR) | $(SEDPIPE))
-INST_INCLDIR		:= $(shell echo $(INST_INCLDIR) | $(SEDPIPE))
-INST_BINDIR		:= $(shell echo $(INST_BINDIR) | $(SEDPIPE))
+INST_LIBDIR		= $(shell echo $(addsuffix $(INSTALLDIROK),$(libdir)) | $(SEDPIPE))
+INST_HIDIR		= $(INST_LIBDIR)/hi
+INST_INCLDIR		= $(INST_HIDIR)
+INST_BINDIR		= $(shell echo $(addsuffix $(INSTALLDIROK),$(bindir)) | $(SEDPIPE))
 
 # these values are used for building a library in-place
 INPL_HIDIR		:= $(sort $(patsubst %/.,%,$(patsubst %/,%,\