From: Jens P. <pet...@ha...> - 2004-07-28 01:24:42
|
I tried to get this functionality into the makefiles a while back, but iirc the patch I submitted at the time broke building on Windows or something. Anyway here is a second attempt, which seems to work for me anyway. Any objects to installing this? Jens 2004-07-28 Jens Petersen <pet...@ha...> * mk/common.mk: 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 diff -u -r1.28 common.mk --- common.mk 27 Jul 2004 08:22:58 -0000 1.28 +++ common.mk 28 Jul 2004 01:18:52 -0000 @@ -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 %/,%,\ |
From: Jens P. <pet...@ha...> - 2004-07-28 02:44:00
|
Jens Petersen wrote: > 2004-07-28 Jens Petersen <pet...@ha...> > > * mk/common.mk: Define INST_HIDIR, INST_LIBDIR, INST_INCLDIR and > INST_BINDIR directly as normal make variables, so that lib > packages get installed in separate subdirs. Ok, I committed this for now anyway along with a small change to library.mk. If it should cause any problems feel free to revert. Jens |