Commit a2cb74da authored by Eric Vidal's avatar Eric Vidal 💬

use the good variable at man page

parent 2722a588
......@@ -59,9 +59,10 @@ ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS)
ALL_INCLUDES := $(wildcard src/include/$(package)/*.h)
ALL_DATA := $(wildcard skel/*)
ALL_MAN := $(wildcard doc/man/*.[1-8].scd)
ALL_DIR := $(skel) $(system_dir) $(system_log) $(service_system) $(service_adm) $(service_admconf)
INSTALL_MAN := $(wildcard doc/man/*.[1-8])
all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) $(ALL_DATA)
all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) $(ALL_DATA) $(ALL_DIR)
clean:
@exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) \
......@@ -78,7 +79,7 @@ tgz: distclean
tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f /tmp/$$package-$$version.tar.gz $$package-$$version && \
exec rm -rf /tmp/$$package-$$version
strip: $(ALL_LIBS) $(ALL_BINS)
strip: $(ALL_LIBS) $(ALL_BINS) $(ALL_DIR)
ifneq ($(strip $(STATIC_LIBS)),)
exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS)
endif
......@@ -86,14 +87,18 @@ ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),)
exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) $(SHARED_LIBS)
endif
install: install-dynlib install-libexec install-bin install-lib install-include install-data
install: install-dynlib install-libexec install-bin install-lib install-include install-data install-dir
install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so)
install-libexec: $(LIBEXEC_TARGETS:%=$(DESTDIR)$(libexecdir)/%)
install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%)
install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a)
install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h)
install-data: $(ALL_DATA:skel/%=$(DESTDIR)$(sysconfdir)/66/%)
install-data: $(ALL_DATA:skel/%=$(DESTDIR)$(skel)/%)
install-dir: $(ALL_DIR:/%=$(DESTDIR)/%)
$(DESTDIR)/%:
install -d -m755 $@
ifneq ($(exthome),)
$(DESTDIR)$(exthome): $(DESTDIR)$(home)
......@@ -113,7 +118,7 @@ $(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M): $(DESTDIR)$(dynlibdir)/lib%
endif
$(DESTDIR)$(sysconfdir)/66/%: skel/%
$(DESTDIR)$(skel)/%: skel/%
exec $(INSTALL) -D -m 644 $< $@
grep -- ^$(@F) < package/modes | { read name mode owner && \
if [ x$$owner != x ] ; then chown -- $$owner $@ ; fi && \
......@@ -123,9 +128,6 @@ $(DESTDIR)$(sysconfdir)/66/%: skel/%
-e "s/@LIVEDIR@/$(subst /,\/,$(livedir))/g" \
-e "s/@SKEL@/$(subst /,\/,$(skel))/g" $< > $@
$(DESTDIR)$(system_log)/% $(DESTDIR)$(service_packager)/% $(DESTDIR)$(service_sys)/% $(DESTDIR)$(service_sysconf)/% :
exec $(INSTALL) -D -m 0755 $< $@
$(DESTDIR)$(dynlibdir)/lib%.so: lib%.so.xyzzy
$(INSTALL) -D -m 755 $< $@.$(version) && \
$(INSTALL) -l $(@F).$(version) $@.$(version_m) && \
......@@ -169,13 +171,13 @@ man: $(ALL_MAN:%.scd=%)
sed -e 's,%%livedir%%,$(livedir),' \
-e 's,%%system_dir%%,$(system_dir),' \
-e 's,%%user_dir%%,$(user_dir),' \
-e 's,%%service_sysconf%%,$(service_sysconf),' \
-e 's,%%service_sysconf%%,$(service_admconf),' \
-e 's,%%service_userconf%%,$(service_userconf),' \
-e 's,%%service_packager%%,$(service_packager),g' \
-e 's,%%service_packager%%,$(service_system),g' \
-e 's,%%user_log%%,$(user_log),' \
-e 's,%%service_sys%%,$(service_sys),' \
-e 's,%%service_sys%%,$(service_adm),' \
-e 's,%%system_log%%,$(system_log),' \
-e 's,%%sysconfdir%%,$(sysconfdir),' \
-e 's,%%sysconfdir%%,$(skel),' \
-e 's,%%service_user%%,$(service_user),' $@.scd | scdoc > $@
install-man:
......
......@@ -28,7 +28,7 @@ Fine tuning of the installation directories:
--shebangdir=DIR absolute path for execline #\! invocations [BINDIR]
--livedir=DIR default live directory [/run/66]
--with-rc-skeleton=DIR skeleton rc.{init,shutdown} file [SYSDIR/66]
--with-skeleton=DIR skeleton files directory installation [SYSDIR/66]
--with-system-log=DIR system service log directory[/var/log/66]
--with-system-dir=DIR 66 tools system working directory[PREFIX/lib/66]
......@@ -212,7 +212,7 @@ for arg ; do
--mandir=*) mandir=${arg#*=} ;;
--shebangdir=*) shebangisdefault=false ; shebangdir=${arg#*=} ;;
--livedir=*) livedir=${arg#*=} ;;
--with-rc-skeleton=*) skel=${arg#*=} ;;
--with-skeleton=*) skel=${arg#*=} ;;
--with-system-dir=*) system_dir=${arg#*=} ;;
--with-system-log=*) system_log=${arg#*=} ;;
--with-system-service=*) service_system=${arg#*=} ;;
......@@ -336,12 +336,12 @@ if $slashpackage ; then
sysconfdir=${home}/etc
datarootdir=${home}/data
mandir=${dataroodir}/doc/man
skel=${sysconfdir}/66
system_dir=${home}/system
system_log=${datarootdir}/log/66
service_system=${home}/service
service_adm=${home}/${sysconfdir}/66/service
service_admconf=${home}/${sysconfdir}/66/conf
skel=${skel}
system_dir=${home}/${system_dir}
system_log=${datarootdir}/${system_log}
service_system=${home}/${service_system}
service_adm=${home}/${sysconfdir}/${service_adm}
service_admconf=${home}/${sysconfdir}/${service_admconf}
if $shebangisdefault ; then
shebangdir=${extbinprefix}
fi
......@@ -566,7 +566,7 @@ All rights reserved.*/
#define ${package_macro_name}_VERSION "$version"
#define ${package_macro_name}_LIVE "$livedir/"
#define ${package_macro_name}_SYSTEM_DIR "$system_dir/"
#define ${package_macro_name}_DATA_SYSDIR "$sysconfdir/"
#define ${package_macro_name}_SKEL_DIR "$skel/"
#define ${package_macro_name}_LOGGER_SYSDIR "$system_log/"
#define ${package_macro_name}_SERVICE_SYSDIR "$service_system/"
#define ${package_macro_name}_SERVICE_ADMDIR "$service_adm/"
......
......@@ -39,11 +39,11 @@
unsigned int VERBOSITY = 1 ;
static mode_t mask = SS_BOOT_UMASK ;
static unsigned int rescan = SS_BOOT_RESCAN ;
static char const *skel = SS_DATA_SYSDIR ;
static char const *skel = SS_SKEL_DIR ;
static char *live = SS_LIVE ;
static char const *path = SS_BOOT_PATH ;
static char const *tree = SS_BOOT_TREE ;
static char const *rcinit = SS_DATA_SYSDIR SS_BOOT_RCINIT ;
static char const *rcinit = SS_SKEL_DIR SS_BOOT_RCINIT ;
static char const *banner = "\n[Starts stage1 process...]" ;
static char const *slashdev = 0 ;
static char const *envdir = 0 ;
......
......@@ -59,7 +59,7 @@ static char OWNERSTR[UID_FMT] ;
static gid_t GIDOWNER ;
static char GIDSTR[GID_FMT] ;
static char TMPENV[MAXENV+1] ;
static char const *skel = SS_DATA_SYSDIR ;
static char const *skel = SS_SKEL_DIR ;
static char const *log_user = "root" ;
static unsigned int BOOT = 0 ;
unsigned int VERBOSITY = 1 ;
......
......@@ -45,7 +45,7 @@
#define USAGE "66-shutdown [ -H ] [ -l live ] [ -h | -p | -r | -k ] [ -f | -F ] [ -a ] [ -t sec ] time [ message ] or 66-shutdown -c [ message ]"
#define AC_FILE SS_DATA_SYSDIR "shutdown.allow"
#define AC_FILE SS_SKEL_DIR "shutdown.allow"
#define AC_BUFSIZE 4096
#define AC_MAX 64
......
......@@ -56,7 +56,7 @@
#define DOTSUFFIX ":XXXXXX"
#define DOTSUFFIXLEN (sizeof(DOTSUFFIX) - 1)
#define SHUTDOWND_FIFO "fifo"
static char const *conf = SS_DATA_SYSDIR ;
static char const *conf = SS_SKEL_DIR ;
static char const *live = 0 ;
#define USAGE "66-shutdownd [ -h ] [ -l live ] [ -s skel ] [ -g gracetime ]"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment