[Rt-commit] r12912 - rt/branches/3.8-TESTING
elacour at bestpractical.com
elacour at bestpractical.com
Thu Jun 5 04:11:30 EDT 2008
Author: elacour
Date: Thu Jun 5 04:11:30 2008
New Revision: 12912
Modified:
rt/branches/3.8-TESTING/ (props changed)
rt/branches/3.8-TESTING/Makefile.in
Log:
r9221 at datura: manu | 2008-06-05 10:11:22 +0200
Fix "install" usage to be BSD compatible
Make extensive use of @INSTALL@ instead of mkdir, cp
Modified: rt/branches/3.8-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.8-TESTING/Makefile.in (original)
+++ rt/branches/3.8-TESTING/Makefile.in Thu Jun 5 04:11:30 2008
@@ -52,6 +52,7 @@
PERL = @PERL@
+INSTALL = @INSTALL@
CONFIG_FILE_PATH = @CONFIG_FILE_PATH_R@
CONFIG_FILE = $(CONFIG_FILE_PATH)/RT_Config.pm
@@ -329,18 +330,18 @@
# {{{ dirs
dirs:
- mkdir -p $(DESTDIR)/$(RT_LOG_PATH)
- mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
- mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/cache
- mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/etc
- mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/obj
- mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
- mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
- mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
- mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
- mkdir -p $(DESTDIR)/$(LOCAL_LIB_PATH)
- mkdir -p $(DESTDIR)/$(LOCAL_PLUGIN_PATH)
- mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_LOG_PATH)
+ $(INSTALL) -m 0770 -d $(DESTDIR)/$(MASON_DATA_PATH)
+ $(INSTALL) -m 0770 -d $(DESTDIR)/$(MASON_DATA_PATH)/cache
+ $(INSTALL) -m 0770 -d $(DESTDIR)/$(MASON_DATA_PATH)/etc
+ $(INSTALL) -m 0770 -d $(DESTDIR)/$(MASON_DATA_PATH)/obj
+ $(INSTALL) -m 0770 -d $(DESTDIR)/$(MASON_SESSION_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_HTML_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_ETC_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_LIB_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_PLUGIN_PATH)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_LEXICON_PATH)
# }}}
install: config-install dirs files-install fixperms instruct
@@ -348,9 +349,9 @@
files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
config-install:
- mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)
- -cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
- [ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE)
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(CONFIG_FILE_PATH)
+ -$(INSTALL) -m 0644 etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
+ [ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0644 etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE)
chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
@@ -391,50 +392,42 @@
# {{{ libs-install
libs-install:
- [ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
- -cd lib && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(RT_LIB_PATH)/{} \;
+ [ -d $(DESTDIR)/$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_LIB_PATH)
+ -cd lib && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_LIB_PATH)/{} \;
+ -cd lib && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(RT_LIB_PATH)/{} \;
# }}}
# {{{ html-install
html-install:
- [ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
- -cd share/html && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(MASON_HTML_PATH)/{} \;
+ [ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_HTML_PATH)
+ -cd share/html && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_HTML_PATH)/{} \;
+ -cd share/html && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(MASON_HTML_PATH)/{} \;
# }}}
# {{{ doc-install
doc-install:
# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH)
- [ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir -p $(DESTDIR)/$(RT_DOC_PATH)
- -cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
+ [ -d $(DESTDIR)/$(RT_DOC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_DOC_PATH)
+ -$(INSTALL) -m 0644 ./README $(DESTDIR)/$(RT_DOC_PATH)/
# }}}
# {{{ etc-install
etc-install:
- mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
- -cp -rp \
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_ETC_PATH)
+ -$(INSTALL) -m 0644 \
etc/acl.* \
etc/initialdata \
etc/schema.* \
- $(DESTDIR)/$(RT_ETC_PATH)
+ $(DESTDIR)/$(RT_ETC_PATH)/
# }}}
# {{{ sbin-install
sbin-install:
- mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
- chmod +x \
- sbin/rt-dump-database \
- sbin/rt-setup-database \
- sbin/rt-test-dependencies \
- sbin/rt-clean-sessions \
- sbin/rt-shredder \
- sbin/rt-notify-group-admin \
- sbin/rt-send-digest \
- sbin/rt-email-dashboards \
- sbin/rt-server
- -cp -rp \
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_SBIN_PATH)
+ -$(INSTALL) -m 0755 \
sbin/rt-dump-database \
sbin/rt-setup-database \
sbin/rt-test-dependencies \
@@ -444,17 +437,15 @@
sbin/rt-send-digest \
sbin/rt-email-dashboards \
sbin/rt-server \
- $(DESTDIR)/$(RT_SBIN_PATH)
+ $(DESTDIR)/$(RT_SBIN_PATH)/
# }}}
# {{{ bin-install
bin-install:
- mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
- chmod +x bin/rt-mailgate \
- bin/rt-crontool
- -cp -rp \
+ $(INSTALL) -m 0755 -d $(DESTDIR)/$(RT_BIN_PATH)
+ -$(INSTALL) -m 0755 \
bin/rt-mailgate \
bin/mason_handler.fcgi \
bin/mason_handler.scgi \
@@ -463,14 +454,17 @@
bin/rt \
bin/webmux.pl \
bin/rt-crontool \
- $(DESTDIR)/$(RT_BIN_PATH)
+ $(DESTDIR)/$(RT_BIN_PATH)/
# }}}
# {{{ local-install
local-install:
- -cd local/html && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
- -cd local/po && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
- -cd local/etc && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
+ -cd local/html && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
+ -cd local/html && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
+ -cd local/po && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
+ -cd local/po && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 -D {} $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
+ -cd local/etc && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
+ -cd local/etc && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
# }}}
# {{{ Best Practical Build targets -- no user servicable parts inside
More information about the Rt-commit
mailing list