Browse Source

Fix sysconfdir default value

2.3.1
Danilo Spinella 3 years ago
parent
commit
c679955d24
  1. 4
      Makefile
  2. 18
      configure

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)/%)
install-sysadm-scripts: $(SCRIPTS_SYSADM_TARGETS:scripts/%=$(DESTDIR)$(sysconfdir)/66/%)
install-service: $(SERVICES_TARGETS:service/%=$(DESTDIR)$(service_directory)/%)
$(DESTDIR)$(boot_conf): boot.conf
exec $(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(sysconfdir)/%: scripts/rc.local
$(DESTDIR)$(sysconfdir)/66/%: scripts/rc.local
exec $(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(scripts)/%: scripts/%

18
configure vendored

@ -15,7 +15,7 @@ Installation directories:
Fine tuning of the installation directories:
--bindir=BINDIR user executables [EPREFIX/bin]
--libdir=LIBDIR static library files [PREFIX/lib/$ss_dir]
--sysconfdir=SYSDIR global configuration files [/etc/66]
--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]
@ -107,12 +107,12 @@ prefix=
exec_prefix='$prefix'
bindir='$exec_prefix/bin'
libdir='$prefix/lib/$ss_dir'
sysconfdir='/etc/66'
sysconfdir='/etc'
datarootdir='$prefix/share'
shebangdir='$bindir'
service_directory='$datarootdir/66/service'
boot_conf='$sysconfdir/boot.conf'
init_conf='$sysconfdir/init.conf'
boot_conf='$sysconfdir/66/boot.conf'
init_conf='$sysconfdir/66/init.conf'
scripts='$libdir/scripts'
HOSTNAME='obliveS6'
HARDWARECLOCK='UTC'
@ -187,13 +187,13 @@ fi
if test -z "$sysconfdir" ; then
if test "$sysconfdir" = '$sysconfdir' ; then
sysconfdir = '/etc/66'
sysconfdir = '/etc'
fi
if test "$boot_conf" = '$sysconfdir/boot.conf' ; then
boot_conf = '$sysconfdir/boot.conf'
if test "$boot_conf" = '$sysconfdir/66/boot.conf' ; then
boot_conf = '$sysconfdir/66/boot.conf'
fi
if test "$init_conf" = '$sysconfdir/init.conf' ; then
boot_conf = '$sysconfdir/init.conf'
if test "$init_conf" = '$sysconfdir/66/init.conf' ; then
init_conf = '$sysconfdir/66/init.conf'
fi
fi

Loading…
Cancel
Save