configure skel

Makefile

@@ -57,8 +57,9 @@ INSTALL := ./tools/install.sh
 ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS)
 ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS)
 ALL_INCLUDES := $(wildcard src/include/$(package)/*.h)
+ALL_DATA := $(wildcard skel/*)
 
-all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES)
+all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) $(ALL_DATA)
 
 clean:
 	@exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(EXTRA_TARGETS) 
@@ -82,13 +83,14 @@ 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: install-dynlib install-libexec install-bin install-lib install-include install-data
 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)$(datadir)/%)
+
 ifneq ($(exthome),)
 
 $(DESTDIR)$(exthome): $(DESTDIR)$(home)
@@ -108,6 +110,14 @@ $(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M): $(DESTDIR)$(dynlibdir)/lib%
 
 endif
 
+$(DESTDIR)$(datadir)/%: skel/% 
+	exec $(INSTALL) -D -m 644 $< $@ 
+	grep -- ^$(@F) < package/modes | { read name mode owner && \
+	if [ x$$owner != x ] ; then chown -- $$owner $@ ; fi && \
+	chmod $$mode $@ ; }
+	exec sed -e "s/@BINDIR@/$(subst /,\/,$(bindir))/g" \
+			-e "s/@EXECLINE_SHEBANGPREFIX@/$(subst /,\/,$(shebangdir))/g" $< > $@ 
+	
 $(DESTDIR)$(system_log)/% $(DESTDIR)$(service_packager)/% $(DESTDIR)$(service_sys)/% $(DESTDIR)$(service_sysconf)/% : 
 	exec $(INSTALL) -D -m 0755 $< $@
 

configure

@@ -163,10 +163,10 @@ system_dir='$prefix/lib/66'
 user_dir='.66'
 system_log='/var/log/66'
 user_log='.66/log'
-service_packager="$datadir/service"
-service_sys="$datadir/sysadmin/service"
+service_packager='$datadir/service'
+service_sys='$datadir/sysadmin/service'
 service_user='.66/service'
-service_sysconf="$datadir/conf"
+service_sysconf='$datadir/conf'
 service_userconf='.66/conf'
 sysdeps='$prefix/lib/skalibs/sysdeps'
 manualsysdeps=false
@@ -257,7 +257,14 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir datadir shebangdir sproot sysdeps system_dir; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir shebangdir sproot sysdeps system_dir; do
+  eval tmp=\${$i}
+  eval $i=$tmp
+  stripdir $i
+done
+
+stripdir datadir
+for i in service_packager service_sys service_user service_sysconf; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -292,6 +299,7 @@ if $slashpackage ; then
   libdir=${home}/library
   libexecdir=$bindir
   includedir=${home}/include
+  datadir=${home}/etc/66
   if $shebangisdefault ; then
     shebangdir=${extbinprefix}
   fi

package/deps.mak

@@ -71,7 +71,7 @@ src/lib66/scandir_ok.o src/lib66/scandir_ok.lo: src/lib66/scandir_ok.c src/inclu
 src/lib66/scandir_send_signal.o src/lib66/scandir_send_signal.lo: src/lib66/scandir_send_signal.c src/include/66/utils.h
 src/lib66/set_livedir.o src/lib66/set_livedir.lo: src/lib66/set_livedir.c src/include/66/config.h src/include/66/utils.h
 src/lib66/set_livescan.o src/lib66/set_livescan.lo: src/lib66/set_livescan.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
-src/lib66/set_livestate.o src/lib66/set_livestate.lo: src/lib66/set_livestate.c src/include/66/config.h src/include/66/utils.h
+src/lib66/set_livestate.o src/lib66/set_livestate.lo: src/lib66/set_livestate.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
 src/lib66/set_livetree.o src/lib66/set_livetree.lo: src/lib66/set_livetree.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
 src/lib66/set_ownerhome.o src/lib66/set_ownerhome.lo: src/lib66/set_ownerhome.c src/include/66/config.h src/include/66/utils.h
 src/lib66/set_ownersysdir.o src/lib66/set_ownersysdir.lo: src/lib66/set_ownersysdir.c src/include/66/config.h src/include/66/utils.h

package/modes

@@ -24,3 +24,12 @@ execl-envfile	0755
 66-gnwenv		0755
 66-umountall	0755
 66-echo			0755
+halt			0755
+init			0755
+init.conf		0644
+ishell			0755
+poweroff		0755
+rc.init			0755
+rc.shutdown		0755
+reboot			0755
+shutdown		0755