[Orca-checkins] rev 193 - in trunk/orca: . packages

[blair at orcaware.com]

Author: blair
Date: 2003-01-08 13:04:27 -0800 (Wed, 08 Jan 2003)
New Revision: 193

Modified:
   trunk/orca/INSTALL
   trunk/orca/packages/Makefile.in
Log:
By default, pass UNINST=1 down to the Perl Makefile's so that any old
installed Perl modules are properly deleted.  Otherwise, the Perl
installation may have the old and new modules installed and due to
Perl's module search order, Perl may use the older module instead of
the newer installed module.

* INSTALL (Install any necessary Perl modules):
  Describe that UNINST=1 is passed to the Perl Makefile's and how to
  install the modules without deleting the old version.

* packages/Makefile.in:
  Pass UNINST="$(UNINST)" to all Perl Makefile's.  Allows for
  overriding from make's command line via
  "make install_modules UNINST=0".


Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL	(original)
+++ trunk/orca/INSTALL	2003-01-08 13:04:36.000000000 -0800
@@ -306,6 +306,17 @@
 
     % make install_modules
 
+    This command will pass UNINST=1 down to the Perl Makefile's so
+    that any old installed Perl modules are properly deleted.
+    Otherwise, the Perl installation may have the old and new modules
+    installed and due to Perl's module search order, Perl may use the
+    older module instead of the newer installed module.
+
+    If you do not wish to delete older Perl modules, then run this
+    command:
+
+    % make install_modules UNINST=0
+
  8) Doing an upgrade from Orca 0.23 or older?  Follow these steps.
 
     Due to various changes to Orca between releases, many of the RRD,

Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in	(original)
+++ trunk/orca/packages/Makefile.in	2003-01-08 13:04:36.000000000 -0800
@@ -3,6 +3,13 @@
 PERL                             = @PERL@
 CFLAGS                           = @CFLAGS@
 
+# By default, pass UNINST=1 down to the Perl Makefile's so that any
+# old installed Perl modules are properly deleted.  Otherwise, the
+# Perl installation may have the old and new modules installed and and
+# due to Perl's module search order, Perl may use the older module
+# instead of the newer installed module.
+UNINST                           = 1
+
 compress_zlib_dir                = @COMPRESS_ZLIB_DIR@
 data_dumper_dir                  = @DATA_DUMPER_DIR@
 date_parse_dir                   = @DATE_PARSE_DIR@
@@ -192,28 +199,28 @@
 install_modules: $(INSTALL_PERL_TARGETS)
 
 install_perl_compress_zlib: make_compress_zlib
-	cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_data_dumper: $(data_dumper_dir)/Makefile
-	cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_date_parse: $(date_parse_dir)/Makefile
-	cd $(date_parse_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(date_parse_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_devel_dprof: $(devel_dprof_dir)/Makefile
-	cd $(devel_dprof_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(devel_dprof_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_digest_md5: $(digest_md5_dir)/Makefile
-	cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_math_intervalsearch: $(math_intervalsearch_dir)/Makefile
-	cd $(math_intervalsearch_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(math_intervalsearch_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_rrdtool: make_rrdtool
-	cd $(rrdtool_dir)/perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(rrdtool_dir)/perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 install_perl_storable: $(storable_dir)/Makefile
-	cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+	cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
 
 clean: $(CLEAN_TARGETS)