[Orca-checkins] r452 - in trunk/orca: contrib/rotate_orca_graphs data_gatherers data_gatherers/aix data_gatherers/hp data_gatherers/orca_services data_gatherers/orcallator data_gatherers/procallator data_gatherers/winallator docs lib orca packages
blair at orcaware.com
blair at orcaware.com
Wed May 11 11:37:07 PDT 2005
Author: blair at orcaware.com
Date: Wed May 11 11:36:10 2005
New Revision: 452
Modified:
trunk/orca/contrib/rotate_orca_graphs/Makefile.in
trunk/orca/data_gatherers/Makefile.in
trunk/orca/data_gatherers/aix/Makefile.in
trunk/orca/data_gatherers/hp/Makefile.in
trunk/orca/data_gatherers/orca_services/Makefile.in
trunk/orca/data_gatherers/orcallator/Makefile.in
trunk/orca/data_gatherers/procallator/Makefile.in
trunk/orca/data_gatherers/winallator/Makefile.in
trunk/orca/docs/Makefile.in
trunk/orca/lib/Makefile.in
trunk/orca/orca/Makefile.in
trunk/orca/packages/Makefile.in
Log:
Add $(DESTDIR) support to all install targets. Patch contributed by
Andreas Beckmann <beckmann at unixos.de>.
* contrib/rotate_orca_graphs/Makefile.in,
* data_gatherers/aix/Makefile.in,
* data_gatherers/hp/Makefile.in,
* data_gatherers/Makefile.in,
* data_gatherers/orcallator/Makefile.in,
* data_gatherers/orca_services/Makefile.in,
* data_gatherers/procallator/Makefile.in,
* data_gatherers/winallator/Makefile.in,
* docs/Makefile.in,
* lib/Makefile.in,
* orca/Makefile.in:
Prepend $(DESTDIR) to all paths used to make directories or install
files.
* packages/Makefile.in:
Handle $(DESTDIR) specially for the Perl modules, as the files that
would normally be installed into $(srcdir_perl_install_rootdir)
would be installed into $(DESTDIR)$(srcdir_perl_install_rootdir),
which is not wanted. So pass to the Perl Makefile's $(DESTDIR) by
prefixing the Perl $(INSTALL*) variables with $(DESTDIR) and clear
$(DESTDIR).
Modified: trunk/orca/contrib/rotate_orca_graphs/Makefile.in
==============================================================================
--- trunk/orca/contrib/rotate_orca_graphs/Makefile.in (original)
+++ trunk/orca/contrib/rotate_orca_graphs/Makefile.in Wed May 11 11:36:10 2005
@@ -25,10 +25,10 @@
chmod 0755 $@
install:
- $(MKDIR) $(bindir)
- @for file in $(TARGETS); do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir); \
+ $(MKDIR) $(DESTDIR)$(bindir)
+ @for file in $(TARGETS); do \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
clean:
Modified: trunk/orca/data_gatherers/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/Makefile.in (original)
+++ trunk/orca/data_gatherers/Makefile.in Wed May 11 11:36:10 2005
@@ -48,7 +48,7 @@
$(RM) Makefile
clean-recursive distclean-recursive:
- for subdir in $(SUBDIRS); do \
+ for subdir in $(SUBDIRS); do \
target=`echo $@ | sed 's/-recursive//'`; \
echo making $$target in $$subdir; \
(cd $$subdir && $(MAKE) $$target) || exit 1; \
Modified: trunk/orca/data_gatherers/aix/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/aix/Makefile.in (original)
+++ trunk/orca/data_gatherers/aix/Makefile.in Wed May 11 11:36:10 2005
@@ -38,10 +38,10 @@
test: check
install: all
- $(MKDIR) $(bindir)
+ $(MKDIR) $(DESTDIR)$(bindir)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
clean:
Modified: trunk/orca/data_gatherers/hp/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/hp/Makefile.in (original)
+++ trunk/orca/data_gatherers/hp/Makefile.in Wed May 11 11:36:10 2005
@@ -38,10 +38,10 @@
test: check
install: all
- $(MKDIR) $(bindir)
+ $(MKDIR) $(DESTDIR)$(bindir)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
clean:
Modified: trunk/orca/data_gatherers/orca_services/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/Makefile.in (original)
+++ trunk/orca/data_gatherers/orca_services/Makefile.in Wed May 11 11:36:10 2005
@@ -46,26 +46,26 @@
test: check
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(libexecdir)
- $(MKDIR) $(sysconfdir)
- $(MKDIR) $(RAW_ORCA_SERVICES_DIR)
- $(MKDIR) $(RRD_ORCA_SERVICES_DIR)
+ $(MKDIR) $(DESTDIR)$(bindir)
+ $(MKDIR) $(DESTDIR)$(libexecdir)
+ $(MKDIR) $(DESTDIR)$(sysconfdir)
+ $(MKDIR) $(DESTDIR)$(RAW_ORCA_SERVICES_DIR)
+ $(MKDIR) $(DESTDIR)$(RRD_ORCA_SERVICES_DIR)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
@for file in `echo $(LIBEXEC_TARGETS)`; do \
- echo $(INSTALL) $$file $(libexecdir); \
- $(INSTALL) $$file $(libexecdir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(libexecdir); \
+ $(INSTALL) $$file $(DESTDIR)$(libexecdir) || exit 1; \
done
- if test -r $(sysconfdir)/orca_services.cfg; then \
+ if test -r $(DESTDIR)$(sysconfdir)/orca_services.cfg; then \
date="`date +%Y-%m-%d-%H:%M:%S`"; \
- echo $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir)/orca_services.cfg.$$date; \
- $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir)/orca_services.cfg.$$date || exit 1; \
+ echo $(INSTALL) -m 0644 orca_services.cfg $(DESTDIR)$(sysconfdir)/orca_services.cfg.$$date; \
+ $(INSTALL) -m 0644 orca_services.cfg $(DESTDIR)$(sysconfdir)/orca_services.cfg.$$date || exit 1; \
else \
- echo $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir); \
- $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir) || exit 1; \
+ echo $(INSTALL) -m 0644 orca_services.cfg $(DESTDIR)$(sysconfdir); \
+ $(INSTALL) -m 0644 orca_services.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
fi
orca_services_run_at_boot: all
Modified: trunk/orca/data_gatherers/orcallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/Makefile.in (original)
+++ trunk/orca/data_gatherers/orcallator/Makefile.in Wed May 11 11:36:10 2005
@@ -47,23 +47,23 @@
test: check
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(libdir)
- $(MKDIR) $(sysconfdir)
- $(MKDIR) $(RAW_ORCALLATOR_DIR)
- $(MKDIR) $(RRD_ORCALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(bindir)
+ $(MKDIR) $(DESTDIR)$(libdir)
+ $(MKDIR) $(DESTDIR)$(sysconfdir)
+ $(MKDIR) $(DESTDIR)$(RAW_ORCALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(RRD_ORCALLATOR_DIR)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
- $(INSTALL) -m 0644 orcallator.se $(libdir)
- if test -r $(sysconfdir)/orcallator.cfg; then \
+ $(INSTALL) -m 0644 orcallator.se $(DESTDIR)$(libdir)
+ if test -r $(DESTDIR)$(sysconfdir)/orcallator.cfg; then \
date="`date +%Y-%m-%d-%H:%M:%S`"; \
- echo $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir)/orcallator.cfg.$$date; \
- $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir)/orcallator.cfg.$$date || exit 1; \
+ echo $(INSTALL) -m 0644 orcallator.cfg $(DESTDIR)$(sysconfdir)/orcallator.cfg.$$date; \
+ $(INSTALL) -m 0644 orcallator.cfg $(DESTDIR)$(sysconfdir)/orcallator.cfg.$$date || exit 1; \
else \
- echo $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir); \
- $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir) || exit 1; \
+ echo $(INSTALL) -m 0644 orcallator.cfg $(DESTDIR)$(sysconfdir); \
+ $(INSTALL) -m 0644 orcallator.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
fi
orcallator_run_at_boot: all
Modified: trunk/orca/data_gatherers/procallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/Makefile.in (original)
+++ trunk/orca/data_gatherers/procallator/Makefile.in Wed May 11 11:36:10 2005
@@ -45,20 +45,20 @@
test: check
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(RAW_PROCALLATOR_DIR)
- $(MKDIR) $(RRD_PROCALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(bindir)
+ $(MKDIR) $(DESTDIR)$(RAW_PROCALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(RRD_PROCALLATOR_DIR)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
- if test -r $(sysconfdir)/procallator.cfg; then \
+ if test -r $(DESTDIR)$(sysconfdir)/procallator.cfg; then \
date="`date +%Y-%m-%d-%H:%M:%S`"; \
- echo $(INSTALL) -m 0644 procallator.cfg $(sysconfdir)/procallator.cfg.$$date; \
- $(INSTALL) -m 0644 procallator.cfg $(sysconfdir)/procallator.cfg.$$date || exit 1; \
+ echo $(INSTALL) -m 0644 procallator.cfg $(DESTDIR)$(sysconfdir)/procallator.cfg.$$date; \
+ $(INSTALL) -m 0644 procallator.cfg $(DESTDIR)$(sysconfdir)/procallator.cfg.$$date || exit 1; \
else \
- echo $(INSTALL) -m 0644 procallator.cfg $(sysconfdir); \
- $(INSTALL) -m 0644 procallator.cfg $(sysconfdir) || exit 1; \
+ echo $(INSTALL) -m 0644 procallator.cfg $(DESTDIR)$(sysconfdir); \
+ $(INSTALL) -m 0644 procallator.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
fi
procallator_run_at_boot: all
Modified: trunk/orca/data_gatherers/winallator/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/winallator/Makefile.in (original)
+++ trunk/orca/data_gatherers/winallator/Makefile.in Wed May 11 11:36:10 2005
@@ -41,22 +41,22 @@
test: check
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(libdir)
- $(MKDIR) $(sysconfdir)
- $(MKDIR) $(RAW_WINALLATOR_DIR)
- $(MKDIR) $(RRD_WINALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(bindir)
+ $(MKDIR) $(DESTDIR)$(libdir)
+ $(MKDIR) $(DESTDIR)$(sysconfdir)
+ $(MKDIR) $(DESTDIR)$(RAW_WINALLATOR_DIR)
+ $(MKDIR) $(DESTDIR)$(RRD_WINALLATOR_DIR)
@for file in `echo $(BIN_TARGETS)`; do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
- if test -r $(sysconfdir)/winallator.cfg; then \
+ if test -r $(DESTDIR)$(sysconfdir)/winallator.cfg; then \
date="`date +%Y-%m-%d-%H:%M:%S`"; \
- echo $(INSTALL) -m 0644 winallator.cfg $(sysconfdir)/winallator.cfg.$$date; \
- $(INSTALL) -m 0644 winallator.cfg $(sysconfdir)/winallator.cfg.$$date || exit 1; \
+ echo $(INSTALL) -m 0644 winallator.cfg $(DESTDIR)$(sysconfdir)/winallator.cfg.$$date; \
+ $(INSTALL) -m 0644 winallator.cfg $(DESTDIR)$(sysconfdir)/winallator.cfg.$$date || exit 1; \
else \
- echo $(INSTALL) -m 0644 winallator.cfg $(sysconfdir); \
- $(INSTALL) -m 0644 winallator.cfg $(sysconfdir) || exit 1; \
+ echo $(INSTALL) -m 0644 winallator.cfg $(DESTDIR)$(sysconfdir); \
+ $(INSTALL) -m 0644 winallator.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
fi
clean:
Modified: trunk/orca/docs/Makefile.in
==============================================================================
--- trunk/orca/docs/Makefile.in (original)
+++ trunk/orca/docs/Makefile.in Wed May 11 11:36:10 2005
@@ -29,8 +29,8 @@
test: check
install: all
- $(MKDIR) $(mandir)
- $(INSTALL) -m 0644 orca.man $(mandir)/orca.1
+ $(MKDIR) $(DESTDIR)$(mandir)
+ $(INSTALL) -m 0644 orca.man $(DESTDIR)$(mandir)/orca.1
Makefile: Makefile.in
cd .. && CONFIG_FILES=docs/Makefile ./config.status
Modified: trunk/orca/lib/Makefile.in
==============================================================================
--- trunk/orca/lib/Makefile.in (original)
+++ trunk/orca/lib/Makefile.in Wed May 11 11:36:10 2005
@@ -32,29 +32,29 @@
test: check
install: all
- $(MKDIR) $(libdir)/perl/Orca
- $(MKDIR) $(libdir)/SE/3.2.1
- $(MKDIR) $(libdir)/SE/3.3
- $(MKDIR) $(libdir)/SE/3.3.1
- $(MKDIR) $(libdir)/SE/3.4
+ $(MKDIR) $(DESTDIR)$(libdir)/perl/Orca
+ $(MKDIR) $(DESTDIR)$(libdir)/SE/3.2.1
+ $(MKDIR) $(DESTDIR)$(libdir)/SE/3.3
+ $(MKDIR) $(DESTDIR)$(libdir)/SE/3.3.1
+ $(MKDIR) $(DESTDIR)$(libdir)/SE/3.4
@for f in Orca/*.pm; do \
- echo $(INSTALL) -m 0644 $$f $(libdir)/perl/Orca; \
- $(INSTALL) -m 0644 $$f $(libdir)/perl/Orca || exit 1; \
+ echo $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/perl/Orca; \
+ $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/perl/Orca || exit 1; \
done
@if test -d Orca/Config; then \
- echo $(MKDIR) $(libdir)/perl/Orca/Config; \
- $(MKDIR) $(libdir)/perl/Orca/Config || exit 1; \
+ echo $(MKDIR) $(DESTDIR)$(libdir)/perl/Orca/Config; \
+ $(MKDIR) $(DESTDIR)$(libdir)/perl/Orca/Config || exit 1; \
for f in Orca/Config/*.pm; do \
- echo $(INSTALL) -m 0644 $$f $(libdir)/perl/Orca/Config; \
- $(INSTALL) -m 0644 $$f $(libdir)/perl/Orca/Config || exit 1; \
+ echo $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/perl/Orca/Config; \
+ $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/perl/Orca/Config || exit 1; \
done; \
fi
@for d in SE/*; do \
test ! -d $$d && continue; \
for f in $$d/*; do \
test ! -f $$f && continue; \
- echo $(INSTALL) -m 0644 $$f $(libdir)/$$d; \
- $(INSTALL) -m 0644 $$f $(libdir)/$$d || exit 1; \
+ echo $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/$$d; \
+ $(INSTALL) -m 0644 $$f $(DESTDIR)$(libdir)/$$d || exit 1; \
done \
done
@echo "cd ..; sh -c 'svnversion .'"
@@ -62,15 +62,15 @@
echo "Subversion reversion of Orca is: $$current_rev"; \
if test "$$current_rev" != "" && \
test "$$current_rev" != "exported"; then \
- echo Fixing svn revision number in $(libdir)/perl/Orca/Constants.pm; \
+ echo Fixing svn revision number in $(DESTDIR)$(libdir)/perl/Orca/Constants.pm; \
echo $(PERL) -w -p -i \
-e 's/^(\$$ORCA_VER_REVISION\s*=\s*).*/$${1}"'$$current_rev'";/' \
- $(libdir)/perl/Orca/Constants.pm; \
+ $(DESTDIR)$(libdir)/perl/Orca/Constants.pm; \
$(PERL) -w -p -i \
-e 's/^(\$$ORCA_VER_REVISION\s*=\s*).*/$${1}"'$$current_rev'";/' \
- $(libdir)/perl/Orca/Constants.pm || exit 1; \
+ $(DESTDIR)$(libdir)/perl/Orca/Constants.pm || exit 1; \
else \
- echo Not fixing svn revision number in $(libdir)/perl/Orca/Constants.pm; \
+ echo Not fixing svn revision number in $(DESTDIR)$(libdir)/perl/Orca/Constants.pm; \
fi
clean:
Modified: trunk/orca/orca/Makefile.in
==============================================================================
--- trunk/orca/orca/Makefile.in (original)
+++ trunk/orca/orca/Makefile.in Wed May 11 11:36:10 2005
@@ -38,10 +38,10 @@
test: check
install: all
- $(MKDIR) $(bindir)
+ $(MKDIR) $(DESTDIR)$(bindir)
@for file in $(BIN_TARGETS); do \
- echo $(INSTALL) $$file $(bindir); \
- $(INSTALL) $$file $(bindir) || exit 1; \
+ echo $(INSTALL) $$file $(DESTDIR)$(bindir); \
+ $(INSTALL) $$file $(DESTDIR)$(bindir) || exit 1; \
done
upgrade: upgrade_installation
Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in (original)
+++ trunk/orca/packages/Makefile.in Wed May 11 11:36:10 2005
@@ -22,12 +22,17 @@
# Flags to specify where the Perl modules will be installed. Install
# everything except the files that Perl needs to load the module back
-# into an empty directory created in this source tree.
+# into an empty directory created in this source tree. Because the
+# Perl Makefile's honor $(DESTDIR) and by default the files that
+# should not be installed into $(perl_libdir) would be installed into
+# $(DESTDIR)$(srcdir_perl_install_rootdir), explicitly prefix the
+# $(INSTALL*) paths with $(DESTDIR) and clear $(DESTDIR).
PERL_INSTALL_LOCATIONS_FLAGS = PREFIX=$(srcdir_perl_install_rootdir) \
- INSTALLPRIVLIB=$(perl_libdir) \
- INSTALLARCHLIB=$(perl_libdir) \
- INSTALLSITELIB=$(perl_libdir) \
- INSTALLSITEARCH=$(perl_libdir)
+ INSTALLPRIVLIB=$(DESTDIR)$(perl_libdir) \
+ INSTALLARCHLIB=$(DESTDIR)$(perl_libdir) \
+ INSTALLSITELIB=$(DESTDIR)$(perl_libdir) \
+ INSTALLSITEARCH=$(DESTDIR)$(perl_libdir) \
+ DESTDIR=
# Flags to pass to '$(PERL) Makefile.PL' to create the Makefile for a
# Perl module.
@@ -199,6 +204,10 @@
test_storable: $(storable_dir)/Makefile
cd $(storable_dir) && $(MAKE) $(ORCA_MAKE_PERL_MODULE_FLAGS) test
+# This directory is explicitly located in the source directory as a
+# place to install Perl files that should not be installed into the
+# final location with Orca, such as the Perl module manual pages. So
+# $(DESTDIR) should not appear here.
$(srcdir_perl_install_rootdir):
$(MKDIR) $(srcdir_perl_install_rootdir)
More information about the Orca-checkins
mailing list