diff options
author | Bryan Drewery <bryan@shatow.net> | 2014-02-21 06:31:26 +0400 |
---|---|---|
committer | Bryan Drewery <bryan@shatow.net> | 2014-02-21 06:31:26 +0400 |
commit | 470f45621f5ff140ba973b8a7267ef852f6656ab (patch) | |
tree | 5f0586537afc1a59aba99ef510533a922c0afcef | |
parent | 1fcd9cb66e09de34bb9cbdf1fce4ebd86a2ca014 (diff) |
poudriered should be in sbin
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | Makefile.in | 118 | ||||
-rw-r--r-- | src/etc/rc.d/poudriered.in | 2 |
3 files changed, 61 insertions, 61 deletions
diff --git a/Makefile.am b/Makefile.am index 14761ca3..1df65b04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ pkglibexec_PROGRAMS= \ nc \ rename -bin_PROGRAMS= poudriered +sbin_PROGRAMS= poudriered noinst_LIBRARIES= libucl.a AUTOMAKE_OPTIONS= subdir-objects diff --git a/Makefile.in b/Makefile.in index 19d506f0..b0f966db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -82,7 +82,7 @@ POST_UNINSTALL = : pkglibexec_PROGRAMS = cpdup$(EXEEXT) dirempty$(EXEEXT) \ dirwatch$(EXEEXT) make_index$(EXEEXT) nc$(EXEEXT) \ rename$(EXEEXT) -bin_PROGRAMS = poudriered$(EXEEXT) +sbin_PROGRAMS = poudriered$(EXEEXT) subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -118,7 +118,7 @@ am_libucl_a_OBJECTS = \ external/libucl/src/libucl_a-ucl_util.$(OBJEXT) \ external/libucl/src/libucl_a-xxhash.$(OBJEXT) libucl_a_OBJECTS = $(am_libucl_a_OBJECTS) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ +am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" \ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(assetsdir)" \ "$(DESTDIR)$(awkdir)" "$(DESTDIR)$(btcssdir)" \ @@ -126,7 +126,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" \ "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" \ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)" -PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS) +PROGRAMS = $(pkglibexec_PROGRAMS) $(sbin_PROGRAMS) am_cpdup_OBJECTS = src/libexec/poudriere/cpdup/cpdup-cpdup.$(OBJEXT) \ src/libexec/poudriere/cpdup/cpdup-hcproto.$(OBJEXT) \ src/libexec/poudriere/cpdup/cpdup-hclink.$(OBJEXT) \ @@ -532,12 +532,12 @@ libucl.a: $(libucl_a_OBJECTS) $(libucl_a_DEPENDENCIES) $(EXTRA_libucl_a_DEPENDEN $(AM_V_at)-rm -f libucl.a $(AM_V_AR)$(libucl_a_AR) libucl.a $(libucl_a_OBJECTS) $(libucl_a_LIBADD) $(AM_V_at)$(RANLIB) libucl.a -install-binPROGRAMS: $(bin_PROGRAMS) +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ @@ -556,30 +556,30 @@ install-binPROGRAMS: $(bin_PROGRAMS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ } \ ; done -uninstall-binPROGRAMS: +uninstall-pkglibexecPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' \ `; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) +clean-pkglibexecPROGRAMS: + -test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS) +install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ @@ -598,24 +598,24 @@ install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ } \ ; done -uninstall-pkglibexecPROGRAMS: +uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -e 's/$$/$(EXEEXT)/' \ `; \ test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(sbindir)" && rm -f $$files -clean-pkglibexecPROGRAMS: - -test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS) +clean-sbinPROGRAMS: + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) src/libexec/poudriere/cpdup/$(am__dirstamp): @$(MKDIR_P) src/libexec/poudriere/cpdup @: > src/libexec/poudriere/cpdup/$(am__dirstamp) @@ -1507,7 +1507,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(assetsdir)" "$(DESTDIR)$(awkdir)" "$(DESTDIR)$(btcssdir)" "$(DESTDIR)$(btimgdir)" "$(DESTDIR)$(btjsdir)" "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \ + for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(assetsdir)" "$(DESTDIR)$(awkdir)" "$(DESTDIR)$(btcssdir)" "$(DESTDIR)$(btimgdir)" "$(DESTDIR)$(btjsdir)" "$(DESTDIR)$(dtcssdir)" "$(DESTDIR)$(dtimagesdir)" "$(DESTDIR)$(dtjsdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1559,8 +1559,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ - clean-pkglibexecPROGRAMS mostlyclean-am +clean-am: clean-generic clean-noinstLIBRARIES clean-pkglibexecPROGRAMS \ + clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1592,8 +1592,8 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \ - install-pkglibexecPROGRAMS install-sysconfDATA +install-exec-am: install-dist_binSCRIPTS install-pkglibexecPROGRAMS \ + install-sbinPROGRAMS install-sysconfDATA install-html: install-html-am @@ -1634,50 +1634,50 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dist_assetsDATA \ - uninstall-dist_awkDATA uninstall-dist_binSCRIPTS \ - uninstall-dist_btcssDATA uninstall-dist_btimgDATA \ - uninstall-dist_btjsDATA uninstall-dist_dtcssDATA \ - uninstall-dist_dtimagesDATA uninstall-dist_dtjsDATA \ - uninstall-dist_htmlDATA uninstall-dist_pkgdataDATA \ - uninstall-dist_rcSCRIPTS uninstall-man \ - uninstall-pkglibexecPROGRAMS uninstall-sysconfDATA +uninstall-am: uninstall-dist_assetsDATA uninstall-dist_awkDATA \ + uninstall-dist_binSCRIPTS uninstall-dist_btcssDATA \ + uninstall-dist_btimgDATA uninstall-dist_btjsDATA \ + uninstall-dist_dtcssDATA uninstall-dist_dtimagesDATA \ + uninstall-dist_dtjsDATA uninstall-dist_htmlDATA \ + uninstall-dist_pkgdataDATA uninstall-dist_rcSCRIPTS \ + uninstall-man uninstall-pkglibexecPROGRAMS \ + uninstall-sbinPROGRAMS uninstall-sysconfDATA uninstall-man: uninstall-man8 .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-cscope clean-generic \ - clean-noinstLIBRARIES clean-pkglibexecPROGRAMS cscope \ + clean-cscope clean-generic clean-noinstLIBRARIES \ + clean-pkglibexecPROGRAMS clean-sbinPROGRAMS cscope \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ distcheck distclean distclean-compile distclean-generic \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_assetsDATA install-dist_awkDATA \ - install-dist_binSCRIPTS install-dist_btcssDATA \ - install-dist_btimgDATA install-dist_btjsDATA \ - install-dist_dtcssDATA install-dist_dtimagesDATA \ - install-dist_dtjsDATA install-dist_htmlDATA \ - install-dist_pkgdataDATA install-dist_rcSCRIPTS install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man8 install-pdf install-pdf-am \ - install-pkglibexecPROGRAMS install-ps install-ps-am \ - install-strip install-sysconfDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_assetsDATA \ + install-data install-data-am install-dist_assetsDATA \ + install-dist_awkDATA install-dist_binSCRIPTS \ + install-dist_btcssDATA install-dist_btimgDATA \ + install-dist_btjsDATA install-dist_dtcssDATA \ + install-dist_dtimagesDATA install-dist_dtjsDATA \ + install-dist_htmlDATA install-dist_pkgdataDATA \ + install-dist_rcSCRIPTS install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man8 install-pdf \ + install-pdf-am install-pkglibexecPROGRAMS install-ps \ + install-ps-am install-sbinPROGRAMS install-strip \ + install-sysconfDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-dist_assetsDATA \ uninstall-dist_awkDATA uninstall-dist_binSCRIPTS \ uninstall-dist_btcssDATA uninstall-dist_btimgDATA \ uninstall-dist_btjsDATA uninstall-dist_dtcssDATA \ uninstall-dist_dtimagesDATA uninstall-dist_dtjsDATA \ uninstall-dist_htmlDATA uninstall-dist_pkgdataDATA \ uninstall-dist_rcSCRIPTS uninstall-man uninstall-man8 \ - uninstall-pkglibexecPROGRAMS uninstall-sysconfDATA + uninstall-pkglibexecPROGRAMS uninstall-sbinPROGRAMS \ + uninstall-sysconfDATA src/etc/rc.d/poudriered: src/etc/rc.d/poudriered.in diff --git a/src/etc/rc.d/poudriered.in b/src/etc/rc.d/poudriered.in index cad437e8..123f2d00 100644 --- a/src/etc/rc.d/poudriered.in +++ b/src/etc/rc.d/poudriered.in @@ -22,7 +22,7 @@ load_rc_config ${name} : ${poudriered_conf:=/usr/local/etc/${name}.conf} pidfile="${poudriered_pidfile}" -command=/usr/local/bin/poudriered +command=/usr/local/sbin/${name} extra_commands="reload" # run service |