From ab60dcf3194c847cb6b05b64e3e505ad042c36d4 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 29 Apr 2009 14:40:08 +0000 Subject: configurable sysconfdir, datarootdir and datadir --- Makefile | 12 +++++++++++- mkinitfs.in | 15 +++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1162dc6..4e1d33f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ VERSION := 1.1 +sysconfdir ?= /etc/mkinitfs +datarootdir ?= /usr/share +datadir ?= $(datarootdir)/mkinitfs + SBIN_FILES := mkinitfs bootchartd SHARE_FILES := initramfs-init CONF_FILES := mkinitfs.conf \ @@ -31,10 +35,16 @@ DISTFILES := $(IN_FILES) $(CONF_FILES) Makefile INSTALL := install SED := sed -SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' +SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \ + -e 's:@sysconfdir@:$(sysconfdir):g' \ + -e 's:@datadir@:$(datadir):g' all: $(SCRIPTS) + +clean: + rm -f $(SCRIPTS) + help: @echo mkinitfs $(VERSION) @echo "usage: make install [DESTDIR=]" diff --git a/mkinitfs.in b/mkinitfs.in index 85ce5b0..3024c46 100755 --- a/mkinitfs.in +++ b/mkinitfs.in @@ -1,6 +1,12 @@ #!/bin/sh VERSION=@VERSION@ +sysconfdir=@sysconfdir@ +datadir=@datadir@ + +config="$sysconfidir"/mkinitfs.conf +init="$datadir"/initramfs-init +startdir=$PWD _cp() { local i @@ -132,9 +138,6 @@ EOF # main -startdir=$PWD -config=/etc/mkinitfs/mkinitfs.conf -init=/usr/share/mkinitfs/initramfs-init while getopts "b:c:hi:kLlo:t:" opt; do case "$opt" in @@ -153,9 +156,9 @@ while getopts "b:c:hi:kLlo:t:" opt; do done shift $(( $OPTIND - 1 )) -. "$config" -filelists_dir=${filelists_dir:-"/etc/mkinitfs/files.d"} -modulelists_dir=${modules_dir:-"/etc/mkinitfs/modules.d"} +. $(readlink -f "$config") +filelists_dir=${filelists_dir:-"$sysconfdir/files.d"} +modulelists_dir=${modules_dir:-"$sysconfdir/modules.d"} [ -n "$myfeatures" ] && features="$myfeatures" if [ -n "$list_features" ]; then -- cgit v1.2.3