Re: [Gtk2hs-users] package install dir

[Jens P. <pet...@re...>]

>>>>> "AS" == Axel Simon <A....@ke...> writes:

> On Mon, Nov 03, 2003 at 11:39:19PM +0900, Jens Petersen wrote:
> > I would like to suggest that we install all our ghc packages
> > under gtk2hs/$PACKAGENAME by default to be more consistent.
> > Does that sounds ok?
> 
> Yes, I guess that makes sense. I haven't fiddled with
> installation since I modified the makefiles. I might have
> broken the RPM building as well.

I checked in some makefile tweaks yesterday, which seem to
allow a clean tarball to build with the new recurse.mk and
sourceview stuff.

    >> ===================================================================
    >> RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
    >> retrieving revision 1.18 diff -u -r1.18 library.mk
    >> --- mk/library.mk 15 Jul 2003 08:47:18 -0000 1.18
    >> +++ mk/library.mk 3 Nov 2003 14:37:02 -0000
    >> @@ -2,6 +2,8 @@
    >>
    >> LIBNAME ?= $(PACKAGENAME)
    >>
    >> +INSTALLDIR = gtk2hs/$(PACKAGENAME)

    AS> I don't really like the hard-coded file path in
    AS> mk/library.mk. The files in mk/ should be project
    AS> independant (except for mk/config.mk). Could you
    AS> introduce a constant variable in mk/config.mk.in and
    AS> then say

    AS> INSTALLDIR = $(addsuffix
    AS> /,$(COMMONINSTALLDIR))$(PACKAGENAME)

    AS> in mk/library.mk?

Done.  However it doesn't work for me currently without the
patch below.  To me the sed cleanup is not that important,
but is there a better way of fixing this?  (I'm not very
comfortable with our makefiles, and would really like to
move to automake one day... :)

Jens


Index: mk/common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.25
diff -u -r1.25 common.mk
--- mk/common.mk        2 Nov 2003 23:57:58 -0000       1.25
+++ mk/common.mk        4 Nov 2003 07:43:50 -0000
@@ -16,7 +16,7 @@
 SUBDIRSOK              := $(dir $(addsuffix /,$(SUBDIRS)))

 # The user supplied subdirectory where the installed files should go.
-INSTALLDIROK           := $(strip $(if $(INSTALLDIR),\
+INSTALLDIROK           = $(strip $(if $(INSTALLDIR),\
                        /$(patsubst %/,%,$(dir $(INSTALLDIR)/))))

 # directories of installation
@@ -25,10 +25,10 @@
 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_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))

 # these values are used for building a library in-place
 INPL_HIDIR             := $(sort $(patsubst %/.,%,$(patsubst %/,%,\