Commit a0fd021e authored by Natanael Copa's avatar Natanael Copa
Browse files

Revert "Makefile: default prefix is /usr. added a SHARE_DIR variable"

This reverts commit aa24561d.

Conflicts:

	Makefile
parent 075c3814
...@@ -3,7 +3,7 @@ P=alpine-conf ...@@ -3,7 +3,7 @@ P=alpine-conf
PV=$(P)-$(V) PV=$(P)-$(V)
APKF=$(PV).apk APKF=$(PV).apk
TARBZ2=$(PV).tar.bz2 TARBZ2=$(PV).tar.bz2
PREFIX?=/usr PREFIX?=
TMP=$(PV) TMP=$(PV)
LIB_FILES=libalpine.sh LIB_FILES=libalpine.sh
...@@ -30,8 +30,6 @@ DIST_FILES=$(LIB_FILES) $(SBIN_FILES) $(ETC_LBU_FILES) $(EXTRA_DIST) ...@@ -30,8 +30,6 @@ DIST_FILES=$(LIB_FILES) $(SBIN_FILES) $(ETC_LBU_FILES) $(EXTRA_DIST)
DESC="Alpine configuration scripts" DESC="Alpine configuration scripts"
WWW="http://alpinelinux.org/alpine-conf" WWW="http://alpinelinux.org/alpine-conf"
SHARE_DIR := share/lbu
TAR=tar TAR=tar
DB=$(TMP)/var/db/apk/$(PV) DB=$(TMP)/var/db/apk/$(PV)
...@@ -62,8 +60,8 @@ $(TARBZ2): $(DIST_FILES) ...@@ -62,8 +60,8 @@ $(TARBZ2): $(DIST_FILES)
install: install:
install -m 755 -d $(DESTDIR)/$(PREFIX)/sbin install -m 755 -d $(DESTDIR)/$(PREFIX)/sbin
install -m 755 $(SBIN_FILES) $(DESTDIR)/$(PREFIX)/sbin install -m 755 $(SBIN_FILES) $(DESTDIR)/$(PREFIX)/sbin
install -m 755 -d $(DESTDIR)/$(PREFIX)/$(SHARE_DIR) install -m 755 -d $(DESTDIR)/$(PREFIX)/lib
install -m 755 $(LIB_FILES) $(DESTDIR)/$(PREFIX)/$(SHARE_DIR) install -m 755 $(LIB_FILES) $(DESTDIR)/$(PREFIX)/lib
install -m 755 -d $(DESTDIR)/etc/lbu install -m 755 -d $(DESTDIR)/etc/lbu
install -m 755 $(ETC_LBU_FILES) $(DESTDIR)/etc/lbu install -m 755 $(ETC_LBU_FILES) $(DESTDIR)/etc/lbu
......
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