[Gtk2hs-commit] Don't allow the hidir to be configured

[Duncan C. <dun...@wo...>]

Mon Sep 25 09:42:47 PDT 2006  Duncan Coutts <du...@co...>
  * Don't allow the hidir to be configured
  This may or may not be a temporary measure. It's needed
  for now to be able to generate the package.conf.inplace

    hunk ./Makefile.am 65
    +hidir = $(pkglibdir)/imports
    +
    hunk ./cairo/cairo.package.conf.in 12
    -import-dirs: "@hidir@/cairo"
    +import-dirs: "${pkglibdir}/imports/cairo"
    hunk ./cairo/cairo.pkg.in 4
    -     import_dirs     = ["@hidir@/cairo"],
    +     import_dirs     = ["${pkglibdir}/imports/cairo"],
    hunk ./configure.ac 580
    -AC_ARG_WITH(hidir,
    -	[  --with-hidir=DIR        specify install dir for .hi files],
    -	[hidir=$withval],
    -	[hidir='${pkglibdir}/imports'])
    -AC_SUBST(hidir)
    -
    hunk ./gconf/gconf.package.conf.in 10
    -import-dirs: "@hidir@/gconf"
    +import-dirs: "${pkglibdir}/imports/gconf"
    hunk ./gconf/gconf.pkg.in 4
    -     import_dirs     = ["@hidir@/gconf"],
    +     import_dirs     = ["${pkglibdir}/imports/gconf"],
    hunk ./glade/glade.package.conf.in 10
    -import-dirs: "@hidir@/glade"
    +import-dirs: "${pkglibdir}/imports/glade"
    hunk ./glade/glade.pkg.in 4
    -     import_dirs     = ["@hidir@/glade"],
    +     import_dirs     = ["${pkglibdir}/imports/glade"],
    hunk ./glib/glib.package.conf.in 10
    -import-dirs: "@hidir@/glib"
    +import-dirs: "${pkglibdir}/imports/glib"
    hunk ./glib/glib.pkg.in 4
    -     import_dirs     = ["@hidir@/glib"],
    +     import_dirs     = ["${pkglibdir}/imports/glib"],
    hunk ./gtk/gtk.package.conf.in 10
    -import-dirs: "@hidir@/gtk"
    +import-dirs: "${pkglibdir}/imports/gtk"
    hunk ./gtk/gtk.pkg.in 4
    -     import_dirs     = ["@hidir@/gtk"],
    +     import_dirs     = ["${pkglibdir}/imports/gtk"],
    hunk ./gtkglext/gtkglext.package.conf.in 10
    -import-dirs: "@hidir@/gtkglext"
    +import-dirs: "${pkglibdir}/imports/gtkglext"
    hunk ./gtkglext/gtkglext.pkg.in 4
    -     import_dirs     = ["@hidir@/gtkglext"],
    +     import_dirs     = ["${pkglibdir}/imports/gtkglext"],
    hunk ./mozembed/mozembed.package.conf.in 10
    -import-dirs: "@hidir@/mozembed"
    +import-dirs: "${pkglibdir}/imports/mozembed"
    hunk ./mozembed/mozembed.pkg.in 4
    -     import_dirs     = ["@hidir@/mozembed"],
    +     import_dirs     = ["${pkglibdir}/imports/mozembed"],
    hunk ./soegtk/soegtk.package.conf.in 10
    -import-dirs: "@hidir@/soegtk"
    +import-dirs: "${pkglibdir}/imports/soegtk"
    hunk ./soegtk/soegtk.pkg.in 4
    -     import_dirs     = ["@hidir@/soegtk"],
    +     import_dirs     = ["${pkglibdir}/imports/soegtk"],
    hunk ./sourceview/sourceview.package.conf.in 10
    -import-dirs: "@hidir@/sourceview"
    +import-dirs: "${pkglibdir}/imports/sourceview"
    hunk ./sourceview/sourceview.pkg.in 4
    -     import_dirs     = ["@hidir@/sourceview"],
    +     import_dirs     = ["${pkglibdir}/imports/sourceview"],
    hunk ./svgcairo/svgcairo.package.conf.in 12
    -import-dirs: "@hidir@/svgcairo"
    +import-dirs: "${pkglibdir}/imports/svgcairo"
    hunk ./svgcairo/svgcairo.pkg.in 4
    -     import_dirs     = ["@hidir@/svgcairo"],
    +     import_dirs     = ["${pkglibdir}/imports/svgcairo"],