[patch] ion3-20061029_destdir.patch (patch source files to honor DESTDIR)

ion3-20061029_destdir.patch (text/plain), 7.63 KB, created by alexandre on 2006-12-22 19:29:12 UTC

--- ion-3ds-20061029/etc/Makefile	2006-10-29 01:15:50.000000000 +0200
+++ ion-3ds-20061029/etc/Makefile	2006-12-22 07:40:39.000000000 +0100
@@ -23,5 +23,5 @@
 ######################################
 
 _install: etc_install
-	rm -f $(ETCDIR)/look.lua
-	ln -s look_cleanviolet.lua $(ETCDIR)/look.lua
+	rm -f ${DESTDIR}$(ETCDIR)/look.lua
+	ln -s look_cleanviolet.lua ${DESTDIR}$(ETCDIR)/look.lua

--- ion-3ds-20061029/utils/ion-completefile/Makefile	2006-10-29 01:15:48.000000000 +0200
+++ ion-3ds-20061029/utils/ion-completefile/Makefile	2006-12-22 06:31:25.000000000 +0100
@@ -26,5 +26,5 @@
 	$(CC) $< $(CFLAGS) $(LDFLAGS) -o $@
 
 _install:
-	$(INSTALLDIR) $(EXTRABINDIR)
-	$(INSTALL) -s -m $(BIN_MODE) ion-completefile $(EXTRABINDIR)
+	$(INSTALLDIR) ${DESTDIR}$(EXTRABINDIR)
+	$(INSTALL) -s -m $(BIN_MODE) ion-completefile ${DESTDIR}$(EXTRABINDIR)

--- ion-3ds-20061029/ion/Makefile	2006-10-29 01:15:50.000000000 +0200
+++ ion-3ds-20061029/ion/Makefile	2006-12-22 07:06:54.000000000 +0100
@@ -57,5 +57,5 @@
 	$(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c
 
 _install:
-	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR)
+	$(INSTALLDIR) ${DESTDIR}$(BINDIR)
+	$(INSTALL) -m $(BIN_MODE) ion3 ${DESTDIR}$(BINDIR)

--- ion-3ds-20061029/libextl/Makefile	2006-10-29 01:16:17.000000000 +0200
+++ ion-3ds-20061029/libextl/Makefile	2006-12-22 07:19:11.000000000 +0100
@@ -32,11 +32,11 @@
 	sed "1s:LUA50:$(LUA):" $< > $@
 
 install:
-	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -m $(BIN_MODE) libextl-mkexports $(BINDIR)
-	$(INSTALLDIR) $(LIBDIR)
-	$(INSTALL) -m $(DATA_MODE) libextl.a $(LIBDIR)
-	$(INSTALLDIR) $(INCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(BINDIR)
+	$(INSTALL) -m $(BIN_MODE) libextl-mkexports ${DESTDIR}$(BINDIR)
+	$(INSTALLDIR) ${DESTDIR}$(LIBDIR)
+	$(INSTALL) -m $(DATA_MODE) libextl.a ${DESTDIR}$(LIBDIR)
+	$(INSTALLDIR) ${DESTDIR}$(INCDIR)
 	for h in $(HEADERS); do \
-		$(INSTALL) -m $(DATA_MODE) $$h $(INCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$h ${DESTDIR}$(INCDIR); \
 	done

--- ion-3ds-20061029/libtu/Makefile	2006-10-29 01:16:16.000000000 +0200
+++ ion-3ds-20061029/libtu/Makefile	2006-12-22 07:15:17.000000000 +0100
@@ -50,9 +50,9 @@
 	$(CC) $(CFLAGS) $< -L. -ltu -lm -o $@
 
 _install:
-	$(INSTALLDIR) $(LIBDIR)
-	$(INSTALLDIR) $(INCDIR)/libtu
-	$(INSTALL) -m $(DATA_MODE) libtu.a $(LIBDIR)
+	$(INSTALLDIR) ${DESTDIR}$(LIBDIR)
+	$(INSTALLDIR) ${DESTDIR}$(INCDIR)/libtu
+	$(INSTALL) -m $(DATA_MODE) libtu.a ${DESTDIR}$(LIBDIR)
 	for i in *.h; do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(INCDIR)/libtu; \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(INCDIR)/libtu; \
 	done

--- ion-3ds-20061029/Makefile	2006-10-29 01:16:17.000000000 +0200
+++ ion-3ds-20061029/Makefile	2006-12-22 05:50:08.000000000 +0100
@@ -30,7 +30,7 @@
 ######################################
 
 _install:
-	$(INSTALLDIR) $(DOCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(DOCDIR)
 	for i in $(DOCS); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(DOCDIR); \
 	done

--- ion-3ds-20061029/man/Makefile	2006-10-29 01:15:49.000000000 +0200
+++ ion-3ds-20061029/man/Makefile	2006-12-22 07:11:37.000000000 +0100
@@ -56,15 +56,15 @@
 	$(NROFF) ion3$*1 | $(FILTERCRAP)) > $@
 
 _install:
-	$(INSTALLDIR) $(MANDIR)/man1
-	$(INSTALL) -m $(DATA_MODE) ion3.1 $(MANDIR)/man1
-	$(INSTALL) -m $(DATA_MODE) pwm3.1 $(MANDIR)/man1
+	$(INSTALLDIR) ${DESTDIR}$(MANDIR)/man1
+	$(INSTALL) -m $(DATA_MODE) ion3.1 ${DESTDIR}$(MANDIR)/man1
+	$(INSTALL) -m $(DATA_MODE) pwm3.1 ${DESTDIR}$(MANDIR)/man1
 	for tr in $(TRANSLATIONS); do \
-		$(INSTALLDIR) $(MANDIR)/$$tr/man1 ; \
-		$(INSTALL) -m $(DATA_MODE) ion3.$$tr.1 $(MANDIR)/$$tr/man1/ion3.1 ; \
-		$(INSTALL) -m $(DATA_MODE) pwm3.$$tr.1 $(MANDIR)/$$tr/man1/pwm3.1 ; \
+		$(INSTALLDIR) ${DESTDIR}$(MANDIR)/$$tr/man1 ; \
+		$(INSTALL) -m $(DATA_MODE) ion3.$$tr.1 ${DESTDIR}$(MANDIR)/$$tr/man1/ion3.1 ; \
+		$(INSTALL) -m $(DATA_MODE) pwm3.$$tr.1 ${DESTDIR}$(MANDIR)/$$tr/man1/pwm3.1 ; \
 	done
-	$(INSTALLDIR) $(SHAREDIR)
+	$(INSTALLDIR) ${DESTDIR}$(SHAREDIR)
 	for i in $(WELCOME_TARGETS); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(SHAREDIR) ; \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(SHAREDIR) ; \
 	done

--- ion-3ds-20061029/mod_statusbar/ion-statusd/Makefile	2006-10-29 01:15:48.000000000 +0200
+++ ion-3ds-20061029/mod_statusbar/ion-statusd/Makefile	2006-12-22 07:20:56.000000000 +0100
@@ -36,5 +36,5 @@
 	$(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
 
 _install: lc_install
-	$(INSTALLDIR) $(EXTRABINDIR)
-	$(INSTALL) -s -m $(BIN_MODE) ion-statusd $(EXTRABINDIR)
+	$(INSTALLDIR) ${DESTDIR}$(EXTRABINDIR)
+	$(INSTALL) -s -m $(BIN_MODE) ion-statusd ${DESTDIR}$(EXTRABINDIR)

--- ion-3ds-20061029/mod_statusbar/Makefile	2006-10-29 01:15:48.000000000 +0200
+++ ion-3ds-20061029/mod_statusbar/Makefile	2006-12-22 07:46:51.000000000 +0100
@@ -30,5 +30,5 @@
 _install: module_install symlink_install
 
 symlink_install:
-	rm -f $(LCDIR)/ext_statusbar.lc
-	ln -s mod_statusbar.lc $(LCDIR)/ext_statusbar.lc
+	rm -f ${DESTDIR}$(LCDIR)/ext_statusbar.lc
+	ln -s mod_statusbar.lc ${DESTDIR}$(LCDIR)/ext_statusbar.lc

--- ion-3ds-20061029/po/Makefile	2006-10-29 01:15:50.000000000 +0200
+++ ion-3ds-20061029/po/Makefile	2006-12-22 07:03:22.000000000 +0100
@@ -79,8 +79,8 @@
 
 _install:
 	for i in $(TRANSLATIONS); do \
-		$(INSTALLDIR) $(LOCALEDIR)/$$i/LC_MESSAGES ; \
-		$(INSTALL) -m $(DATA_MODE) $$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/ion3.mo ; \
+		$(INSTALLDIR) ${DESTDIR}$(LOCALEDIR)/$$i/LC_MESSAGES ; \
+		$(INSTALL) -m $(DATA_MODE) $$i.mo ${DESTDIR}$(LOCALEDIR)/$$i/LC_MESSAGES/ion3.mo ; \
 	done
 
 update_fi: pot

--- ion-3ds-20061029/pwm/Makefile	2006-10-29 01:15:50.000000000 +0200
+++ ion-3ds-20061029/pwm/Makefile	2006-12-22 07:13:49.000000000 +0100
@@ -65,9 +65,9 @@
 	$(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c
 
 _install:
-	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR)
-	$(INSTALLDIR) $(PWM_ETCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(BINDIR)
+	$(INSTALL) -m $(BIN_MODE) pwm3 ${DESTDIR}$(BINDIR)
+	$(INSTALLDIR) ${DESTDIR}$(PWM_ETCDIR)
 	for i in $(ETC); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(PWM_ETCDIR); \
 	done

--- ion-3ds-20061029/build/rules.mk	2006-10-29 01:15:47.000000000 +0200
+++ ion-3ds-20061029/build/rules.mk	2006-12-22 06:09:50.000000000 +0100
@@ -88,8 +88,8 @@
 
 
 module_install: module_stub_install
-	$(INSTALLDIR) $(MODULEDIR)
-	$(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR)
+	$(INSTALLDIR) ${DESTDIR}$(MODULEDIR)
+	$(INSTALL) -m $(BIN_MODE) $(MODULE).so ${DESTDIR}$(MODULEDIR)
 
 else # PRELOAD_MODULES
 
@@ -108,8 +108,8 @@
 endif # PRELOAD_MODULES
 
 module_stub_install:
-	$(INSTALLDIR) $(LCDIR)
-	$(INSTALL) -m $(DATA_MODE) $(MODULE).lc $(LCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(LCDIR)
+	$(INSTALL) -m $(DATA_MODE) $(MODULE).lc ${DESTDIR}$(LCDIR)
 
 ifndef MODULE_STUB
 
@@ -147,15 +147,15 @@
 	$(LUAC) -o $@ $<
 
 lc_install:
-	$(INSTALLDIR) $(LCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(LCDIR)
 	for i in $(LUA_COMPILED); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(LCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(LCDIR); \
 	done
 
 etc_install:
-	$(INSTALLDIR) $(ETCDIR)
+	$(INSTALLDIR) ${DESTDIR}$(ETCDIR)
 	for i in $(ETC); do \
-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
+		$(INSTALL) -m $(DATA_MODE) $$i ${DESTDIR}$(ETCDIR); \
 	done
 
 # Dependencies

--- ion-3ds-20061029/utils/Makefile	2006-10-29 01:15:48.000000000 +0200
+++ ion-3ds-20061029/utils/Makefile	2006-12-22 07:16:56.000000000 +0100
@@ -22,9 +22,9 @@
 ######################################
 
 _install:
-	$(INSTALLDIR) $(SHAREDIR)
+	$(INSTALLDIR) ${DESTDIR}$(SHAREDIR)
 	for i in $(SHELLSCRIPTS); do \
-		$(INSTALL) -m $(BIN_MODE) $$i $(SHAREDIR); \
+		$(INSTALL) -m $(BIN_MODE) $$i ${DESTDIR}$(SHAREDIR); \
 	done
 
 %: %.in