[patch] install packages conditionally, as well as building

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[patch] install packages conditionally, as well as building

S11001001
smalltalk--backstage--2.2--patch-47

     install packages conditionally, as well as building

I moved each install-data-hook:: to be added iff the package in question
should be enabled.  This means you can `make install' without having
Tcl/Tk, for example.

--
;;; Stephen Compall ** http://scompall.nocandysw.com/blog **
But you know how reluctant paranormal phenomena are to reveal
themselves when skeptics are present. --Robert Sheaffer, SkI 9/2003

2007-07-13  Stephen Compall  <[hidden email]>

        * build-aux/package.m4: Write install-data-hook rule for star
        packages only if the package should be enabled.

        * configure.ac: Use same variable in derived Blox conditional as
        in BloxTK.


--- orig/build-aux/package.m4
+++ mod/build-aux/package.m4
@@ -23,6 +23,11 @@
 
 m4_define([_GST_PKG_ENABLE], [
   cat >> pkgrules.tmp << \EOF
+dnl If this is unconditionally included, the rule for $1.star will be
+dnl invoked on install
+install-data-hook:: $1.star
+ $(GST_[]PACKAGE) --srcdir=$(srcdir) --target-directory=$(pkgdatadir) --destdir=$(DESTDIR) $1.star
+
 -include $(srcdir)/_GST_PKG_STAMP
 all-local: $1.star
 EOF
@@ -65,9 +70,6 @@
 uninstall-local::
  $(GST_[]PACKAGE) --srcdir=$(srcdir) --target-directory=$(pkgdatadir) --destdir=$(DESTDIR) --uninstall $(DESTDIR)$(pkgdatadir)/$1.star
 
-install-data-hook:: $1.star
- $(GST_[]PACKAGE) --srcdir=$(srcdir) --target-directory=$(pkgdatadir) --destdir=$(DESTDIR) $1.star
-
 dist-hook:: _GST_PKG_XML
  $(GST_[]PACKAGE) --srcdir=$(srcdir) --target-directory=_GST_PKG_DISTDIR --dist $<
 


--- orig/configure.ac
+++ mod/configure.ac
@@ -277,7 +277,7 @@
     [enable_blox=no
      case x"$enable_gtk" in
  xno|xnot\ found) ;; *) enable_blox=yes ;; esac
-     case x"$gst_cv_tcltk_includes" in
+     case x"$gst_cv_tcltk_libs" in
  xno|xnot\ found) ;; *) enable_blox=yes ;; esac],
     [enable_blox], [package.xml])
 GST_PACKAGE([WebServer], [httpd])




_______________________________________________
help-smalltalk mailing list
[hidden email]
http://lists.gnu.org/mailman/listinfo/help-smalltalk