[Gtk2hs-users] package install dir; build fixes

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

>>>>> "Jens" == Jens Petersen <pet...@re...> writes:

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

    AS> then say

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

    AS> in mk/library.mk?

    Jens> Done.  However it doesn't work for me currently
    Jens> without the patch below.  To me the sed cleanup is
    Jens> not that important, but is there a better way of
    Jens> fixing this?

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

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

    Jens>  # directories of installation
    Jens> @@ -25,10 +25,10 @@
    Jens>  INST_INCLDIR ?= $(INST_HIDIR) INST_BINDIR ?=
    Jens>  $(addsuffix $(INSTALLDIROK),$(bindir))

    Jens> -INST_HIDIR := $(shell echo $(INST_HIDIR) |
    Jens> $(SEDPIPE)) -INST_LIBDIR := $(shell echo
    Jens> $(INST_LIBDIR) | $(SEDPIPE)) -INST_INCLDIR :=
    Jens> $(shell echo $(INST_INCLDIR) | $(SEDPIPE))
    Jens> -INST_BINDIR := $(shell echo $(INST_BINDIR) |
    Jens> $(SEDPIPE)) +#INST_HIDIR := $(shell echo
    Jens> $(INST_HIDIR) | $(SEDPIPE)) +#INST_LIBDIR :=
    Jens> $(shell echo $(INST_LIBDIR) | $(SEDPIPE))
    Jens> +#INST_INCLDIR := $(shell echo $(INST_INCLDIR) |
    Jens> $(SEDPIPE)) +#INST_BINDIR := $(shell echo
    Jens> $(INST_BINDIR) | $(SEDPIPE))

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

FYI since I didn't hear anything I went ahead and checked
this in for now, along with a handful of other other build
fixes.  I also imported demo/sourceview.

Cheers, -Jens


2003-11-11  Jens Petersen  <pet...@ha...>

	* demo/sourceview: New directory for import of sourceview demo
	program by Duncan Coutts <dun...@wo...>.

	* demo/sourceview/haskell.lang: New file giving haskell
	highlighting syntax for gtksourceview.

	* demo/sourceview/SourceViewTest.hs: New file to demonstrate
	sourceview.

	* demo/sourceview/Makefile: New file.
	
	* sourceview/SourceTag.chs (sourceTagSetStyle): Fix docu typo.

	* sourceview/Makefile (EXTRA_HFILES): Use relative path.
	(EXTRA_TARFILES): Not needed.
	(EXTRA_CPPFLAGS): Use SOURCEVIEW_CFLAGS instead.
	(EXTRA_LIBS): Use SOURCEVIEW_LIBS instead.

	* mk/recurse.mk (all): Add MAKE_DOCS.
	(inplace): Ditto.
	(noinplace): Ditto.
	(tarsource): Ditto.
	(clean): Ditto.

	* mk/library.mk	(installdirs): Reorder directories.

	* mk/config.mk.in (SOURCEVIEW_LIBS): Define.
	(SOURCEVIEW_CFLAGS): Ditto.

	* mk/common.mk: Fixes so that per package INSTALLDIR works:
	(INSTALLDIROK): Is now a deferred variable.
	(INST_*): Not passed through SEDPIPE for now.

	* gtk2hs.spec.in (%build): Instead of "--with c2hs" rpmbuild
	option, if %c2hs defined then pass it with --with-c2hs= to
	configure.
	(%install): Install sourceview haskell.lang file.  Clean demo
	to prevent binary files in doc dir.

	* configure.in: Only use GTK for gtk2 package check.  Use GTKGLEXT
	for gtkglext and SOURCEVIEW for gtksourceview, so that sourceview
	cflags and link options do not appear in ghc gtk2 package.  Drop
	unused PIXBUF config vars from GTK config vars.  Process
	SOURCEVIEW config vars in the same way as GTK ones.
	Search for specific external c2hs in PATH, like c2hs is searched
	with --with-c2hs=yes.  Treat "c2hs-gtk2hs" as a exceptional external
	c2hs which supports multiple chs files, allowing one to avoid
	building the internal c2hs on every clean build.

	* Makefile (MAKE_TOOLS): Only add c2hs when BUILT_IN_C2HS is no.
	(MAKE_DOCS): gendoc and doc targets moved here from MAKE_TOOLS since
	doc must be done after gtk.
	(MAKE_APPS): Add demo/sourceview.
	(dist): Depend on gtk2hs.spec.
	(rpm): dist now depends on gtk2hs.spec.
	(srpm): Ditto.
	Include Makefile.local if present for local build configuration.