Revert "Makefile compatibility for *BSD (closes: #887)"
Patch is written backwards and has already been included
This commit is contained in:
Xavier Guimard
parent
6f2dd4315e
commit
7c6afa81bc
48
Makefile
48
Makefile
|
|
@ -456,7 +456,7 @@ install_manager_libs: manager
|
|||
install_bin: install_conf_dir
|
||||
# Binary install
|
||||
@install -v -d $(RBINDIR)
|
||||
@cp --remove-destination\
|
||||
@cp -f\
|
||||
${SRCHANDLERDIR}/example/scripts/purgeLocalCache \
|
||||
${SRCPORTALDIR}/example/scripts/purgeCentralCache \
|
||||
${SRCPORTALDIR}/example/scripts/buildPortalWSDL \
|
||||
|
|
@ -480,10 +480,10 @@ install_bin: install_conf_dir
|
|||
|
||||
install_fastcgi_server:
|
||||
@install -v -d $(RSBINDIR) $(RINITDIR) $(RETCDEFAULTDIR) $(RFASTCGISOCKDIR)
|
||||
@cp --remove-destination fastcgi-server/sbin/llng-fastcgi-server $(RSBINDIR)
|
||||
@cp -f fastcgi-server/sbin/llng-fastcgi-server $(RSBINDIR)
|
||||
@chmod +x $(RSBINDIR)/llng-fastcgi-server
|
||||
@cp --remove-destination fastcgi-server/rc/llng-fastcgi-server $(RINITDIR)
|
||||
@cp --remove-destination fastcgi-server/default/llng-fastcgi-server $(RETCDEFAULTDIR)
|
||||
@cp -f fastcgi-server/rc/llng-fastcgi-server $(RINITDIR)
|
||||
@cp -f fastcgi-server/default/llng-fastcgi-server $(RETCDEFAULTDIR)
|
||||
@$(PERL) -pi -e 's#__SBINDIR__#$(SBINDIR)#;s#__DEFAULTDIR__#$(ETCDEFAULTDIR)#;s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g' \
|
||||
$(RETCDEFAULTDIR)/llng-fastcgi-server \
|
||||
$(RSBINDIR)/llng-fastcgi-server \
|
||||
|
|
@ -515,7 +515,7 @@ install_site: install_manager_site install_portal_site install_handler_site inst
|
|||
@install -v -d $(RCONFDIR)
|
||||
# Check if erase is wanted
|
||||
@if [ "$(ERASECONFIG)" -eq "1" ]; then \
|
||||
cp --remove-destination _example/etc/for_etc_hosts $(RCONFDIR); \
|
||||
cp -f _example/etc/for_etc_hosts $(RCONFDIR); \
|
||||
fi
|
||||
@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)/for_etc_hosts
|
||||
# Fix a lost of rights on the main directory
|
||||
|
|
@ -554,11 +554,11 @@ install_site: install_manager_site install_portal_site install_handler_site inst
|
|||
install_webserver_conf:
|
||||
@install -m 755 -v -d $(RCONFDIR)
|
||||
@if [ "$(ERASECONFIG)" -eq "1" ]; then \
|
||||
cp --remove-destination _example/etc/portal-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp --remove-destination _example/etc/handler-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp --remove-destination _example/etc/manager-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp --remove-destination _example/etc/test-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp --remove-destination _example/etc/*nginx*.conf $(RCONFDIR); \
|
||||
cp -f _example/etc/portal-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp -f _example/etc/handler-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp -f _example/etc/manager-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp -f _example/etc/test-apache$(APACHEVERSION).conf $(RCONFDIR); \
|
||||
cp -f _example/etc/*nginx*.conf $(RCONFDIR); \
|
||||
fi
|
||||
@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g; \
|
||||
s#__PORTALDIR__#$(PORTALDIR)/#g; \
|
||||
|
|
@ -607,12 +607,12 @@ install_portal_site: install_conf_dir
|
|||
[ -h $(RPORTALDIR)/skins/$$skin ] && rm -f $(RPORTALDIR)/skins/$$skin; \
|
||||
install -v -d $(RPORTALSKINSDIR)/$$skin; \
|
||||
done
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/index_skin.pl ${RPORTALDIR}/index.pl
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/mail.pl ${RPORTALDIR}
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/metadata.pl ${RPORTALDIR}
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/openid-configuration.pl ${RPORTALDIR}
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/cdc.pl ${RPORTALDIR}
|
||||
@cp -pR --remove-destination ${SRCPORTALDIR}/example/register.pl ${RPORTALDIR}
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/index_skin.pl ${RPORTALDIR}/index.pl
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/mail.pl ${RPORTALDIR}
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/metadata.pl ${RPORTALDIR}
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/openid-configuration.pl ${RPORTALDIR}
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/cdc.pl ${RPORTALDIR}
|
||||
@cp -pR -f ${SRCPORTALDIR}/example/register.pl ${RPORTALDIR}
|
||||
@tar -cf - -C ${SRCPORTALDIR}/example/skins/ $$(ls ${SRCPORTALDIR}/example/skins/) |tar -xf - -C $(RPORTALSKINSDIR)
|
||||
@for f in `find $(RPORTALSKINSDIR) -type f -name '*.tpl'`; do \
|
||||
./scripts/transform-templates \
|
||||
|
|
@ -635,7 +635,7 @@ install_portal_site: install_conf_dir
|
|||
done; \
|
||||
fi
|
||||
# Cron files
|
||||
@cp --remove-destination $(SRCPORTALDIR)/example/scripts/purgeCentralCache.cron.d $(RCRONDIR)/lemonldap-ng-portal
|
||||
@cp -f $(SRCPORTALDIR)/example/scripts/purgeCentralCache.cron.d $(RCRONDIR)/lemonldap-ng-portal
|
||||
@if [ ! "$(APACHEUSER)" ]; then \
|
||||
$(PERL) -i -pe 's#__APACHEUSER__#nobody#g;' $(RCRONDIR)/lemonldap-ng-portal; \
|
||||
else \
|
||||
|
|
@ -648,7 +648,7 @@ install_portal_site: install_conf_dir
|
|||
install_handler_site: install_conf_dir
|
||||
# Handler install
|
||||
@install -v -d ${RHANDLERDIR}
|
||||
@cp --remove-destination $(SRCHANDLERDIR)/example/scripts/purgeLocalCache.cron.d $(RCRONDIR)/lemonldap-ng-handler
|
||||
@cp -f $(SRCHANDLERDIR)/example/scripts/purgeLocalCache.cron.d $(RCRONDIR)/lemonldap-ng-handler
|
||||
@if [ ! "$(APACHEUSER)" ]; then \
|
||||
$(PERL) -i -pe 's#__APACHEUSER__#nobody#g;' $(RCRONDIR)/lemonldap-ng-handler; \
|
||||
else \
|
||||
|
|
@ -660,7 +660,7 @@ install_handler_site: install_conf_dir
|
|||
install_test_site:
|
||||
# Test site install
|
||||
@install -v -d $(RTESTDIR)
|
||||
@cp -pR --remove-destination _example/test/* $(RTESTDIR)
|
||||
@cp -pR -f _example/test/* $(RTESTDIR)
|
||||
@rm -rf $$(find $(RTESTDIR) -type d -name .svn)
|
||||
@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RTESTDIR)/index.pl
|
||||
@rm -rf $$(find $(RTESTDIR) -type d -name .svn)
|
||||
|
|
@ -669,10 +669,10 @@ install_examples_site:
|
|||
# Examples install
|
||||
@install -v -d $(REXAMPLESDIR)
|
||||
@for i in portal handler; do \
|
||||
cp -a --remove-destination lemonldap-ng-$$i/example $(REXAMPLESDIR)/$$i; \
|
||||
cp -a -f lemonldap-ng-$$i/example $(REXAMPLESDIR)/$$i; \
|
||||
done
|
||||
@for i in manager; do \
|
||||
cp -a --remove-destination lemonldap-ng-$$i/eg $(REXAMPLESDIR)/$$i; \
|
||||
cp -a -f lemonldap-ng-$$i/eg $(REXAMPLESDIR)/$$i; \
|
||||
done
|
||||
@rm -rf $(REXAMPLESDIR)/portal/skins \
|
||||
$(REXAMPLESDIR)/manager/skins \
|
||||
|
|
@ -684,13 +684,13 @@ install_doc_site:
|
|||
# Offline documentation install
|
||||
@rm -rf $(RDEFDOCDIR)
|
||||
@install -v -d $(RDEFDOCDIR)
|
||||
@cp -a --remove-destination doc/* $(RDEFDOCDIR)
|
||||
@cp -a -f doc/* $(RDEFDOCDIR)
|
||||
|
||||
install_conf_dir: install_sessions_dir install_notif_dir install_captcha_dir
|
||||
# Configuration files install
|
||||
@install -v -d $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR)
|
||||
@if [ "$(ERASECONFIG)" -eq "1" ]; then \
|
||||
cp --remove-destination $(SRCCOMMONDIR)/$(CONFFILENAME) $(RCONFDIR); \
|
||||
cp -f $(SRCCOMMONDIR)/$(CONFFILENAME) $(RCONFDIR); \
|
||||
$(PERL) -i -pe 's#^dirName\s*=\s*.*#dirName = $(FILECONFIGDIR)#g' $(RCONFDIR)/$(CONFFILENAME); \
|
||||
fi
|
||||
@cp _example/conf/lmConf-1.js $(RFILECONFIGDIR)
|
||||
|
|
@ -1064,5 +1064,5 @@ omegat-%-clean:
|
|||
install_%_doc_site:
|
||||
@rm -rf $(RDOCDIR)/$*-doc || true
|
||||
@install -v -d $(RDOCDIR)/$*-doc
|
||||
@cp -dR --remove-destination po-doc/$*/* $(RDOCDIR)/$*-doc
|
||||
@cp -dR -f po-doc/$*/* $(RDOCDIR)/$*-doc
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue