Browse Source

use package_macro_dir in place of 66 as variable

2.3.1
obarun 3 years ago
parent
commit
aa2891d234
  1. 4
      Makefile
  2. 34
      configure
  3. 2
      package/info

4
Makefile

@ -18,13 +18,13 @@ INSTALL := ./tools/install.sh
install: install-conf install-lib-scripts install-sysadm-scripts install-service
install-conf: $(CONF_TARGETS:boot.conf=$(DESTDIR)$(boot_conf))
install-lib-scripts: $(SCRIPTS_LIB_TARGETS:scripts/%=$(DESTDIR)$(scripts)/%)
install-sysadm-scripts: $(SCRIPTS_SYSADM_TARGETS:scripts/%=$(DESTDIR)$(sysconfdir)/66/%)
install-sysadm-scripts: $(SCRIPTS_SYSADM_TARGETS:scripts/%=$(DESTDIR)$(sysconfdir)/$(package_macro_dir)/%)
install-service: $(SERVICES_TARGETS:service/%=$(DESTDIR)$(service_directory)/%)
$(DESTDIR)$(boot_conf): boot.conf
exec $(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(sysconfdir)/66/%: scripts/rc.local
$(DESTDIR)$(sysconfdir)/$(package_macro_dir)/%: scripts/rc.local
exec $(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(scripts)/%: scripts/%

34
configure vendored

@ -14,13 +14,13 @@ Installation directories:
Fine tuning of the installation directories:
--bindir=BINDIR user executables [EPREFIX/bin]
--libdir=LIBDIR static library files [PREFIX/lib/$ss_dir]
--libdir=LIBDIR static library files [PREFIX/lib/$package_macro_dir]
--sysconfdir=SYSDIR global configuration files [/etc]
--datarootdir=DATAROOTDIR read-only architecture-independent data root [PREFIX/share]
--shebangdir=DIR absolute path for execline #\! invocations [BINDIR]
--with-system-service=DIR service intallation directory [DATAROOTDIR/66/service]
--with-boot-conf=DIR installation directory of boot.conf [SYSDIR]
--with-init-conf=DIR init.conf skeleton file of 66-boot [SYSDIR]
--with-system-service=DIR service intallation directory [DATAROOTDIR/$package_macro_dir/service]
--with-boot-conf=DIR installation directory of boot.conf [SYSDIR/$package_macro_dir]
--with-init-conf=DIR init.conf skeleton file of 66-boot [SYSDIR/$package_macro_dir]
--with-scripts=DIR installation directory of scripts [LIBDIR/scripts]
Fine tunning of boot configuration:
@ -51,7 +51,9 @@ Fine tunning of boot configuration:
An exclamation mark '!' at the begin of the value unexport the variable
for the environment after the use. This is avoid to poluate the environment
with tempory variables.
with tempory variables. You need to single-quote the options as
follow:
./configure --KEYMAP='!us'
EOF
exit 0
@ -106,13 +108,13 @@ testval () {
prefix=
exec_prefix='$prefix'
bindir='$exec_prefix/bin'
libdir='$prefix/lib/$ss_dir'
libdir='$prefix/lib/$package_macro_dir'
sysconfdir='/etc'
datarootdir='$prefix/share'
shebangdir='$bindir'
service_directory='$datarootdir/66/service'
boot_conf='$sysconfdir/66/boot.conf'
init_conf='$sysconfdir/66/init.conf'
service_directory='$datarootdir/$package_macro_dir/service'
boot_conf='$sysconfdir/$package_macro_dir/boot.conf'
init_conf='$sysconfdir/$package_macro_dir/init.conf'
scripts='$libdir/scripts'
HOSTNAME='obliveS6'
HARDWARECLOCK='UTC'
@ -177,8 +179,8 @@ done
# Add /usr in the default case
if test -z "$prefix" ; then
if test "$libdir" = '$prefix/lib/$ss_dir' ; then
libdir=/usr/lib/$ss_dir
if test "$libdir" = '$prefix/lib/$package_macro_dir' ; then
libdir=/usr/lib/$package_macro_dir
fi
if test "$datarootdir" = '$prefix/share'; then
datarootdir=/usr/share
@ -189,11 +191,11 @@ if test -z "$sysconfdir" ; then
if test "$sysconfdir" = '$sysconfdir' ; then
sysconfdir = '/etc'
fi
if test "$boot_conf" = '$sysconfdir/66/boot.conf' ; then
boot_conf = '$sysconfdir/66/boot.conf'
if test "$boot_conf" = '$sysconfdir/$package_macro_dir/boot.conf' ; then
boot_conf = '$sysconfdir/$package_macro_dirboot.conf'
fi
if test "$init_conf" = '$sysconfdir/66/init.conf' ; then
init_conf = '$sysconfdir/66/init.conf'
if test "$init_conf" = '$sysconfdir/$package_macro_dir/init.conf' ; then
init_conf = '$sysconfdir/$package_macro_dir/init.conf'
fi
fi
@ -266,7 +268,7 @@ service_directory := $service_directory
boot_conf := $boot_conf
init_conf := $init_conf
scripts := $scripts
package_macro_dir := $package_macro_dir
EOF
exec 1>&3 3>&-

2
package/info

@ -1,3 +1,3 @@
package=boot-66serv
version=0.1.0.0
ss_dir=66
package_macro_dir=66

Loading…
Cancel
Save