[packages/eagle-usb.git] / eagle-Makefile.patch

diff -uNr eagle-1.0.4.orig/driver/Makefile eagle-1.0.4/driver/Makefile
--- eagle-1.0.4.orig/driver/Makefile	Wed Jun 18 23:58:41 2003
+++ eagle-1.0.4/driver/Makefile	Wed Jul  9 19:41:39 2003
@@ -106,7 +106,7 @@
 install: driver installfirmware installuser
 	mkdir -p $(INSTALLDIR) && \
 	mkdir -p $(CONFDIR)    && \
-	$(INSTALLER) -m 0664 -o root -g root $(MODULE).o $(INSTALLDIR)/$(MODULE).o && \
+	$(INSTALLER) $(MODULE).o $(DESTDIR)/$(INSTALLDIR)/$(MODULE).o && \
 	/sbin/depmod -a
 
 uninstall:
diff -uNr eagle-1.0.4.orig/driver/firmware/Makefile eagle-1.0.4/driver/firmware/Makefile
--- eagle-1.0.4.orig/driver/firmware/Makefile	Wed Jun  4 01:09:37 2003
+++ eagle-1.0.4/driver/firmware/Makefile	Wed Jul  9 19:42:20 2003
@@ -33,12 +33,12 @@
 	gcc $(CFLAGS) builddsp.c -o buildDSP
 
 install : firmware.bin DSPcode.bin
-	mkdir -p $(CONFIGDIR)
-	$(INSTALLER) -c -m 0664 -o root -g root *.bin $(CONFIGDIR)
+	mkdir -p $(DESTDIR)/$(CONFIGDIR)
+	$(INSTALLER)  *.bin $(DESTDIR)/$(CONFIGDIR)
 
 uninstall:
-	rm -f  $(CONFIGDIR)/DSPcode.bin
-	rm -f $(CONFIGDIR)/firmware.bin
+	rm -f $(DESTDIR)/$(CONFIGDIR)/DSPcode.bin
+	rm -f $(DESTDIR)/$(CONFIGDIR)/firmware.bin
 
 clean :
 	rm -f firmware.bin buildFirmware buildDSP DSPcode.bin
diff -uNr eagle-1.0.4.orig/driver/user/Makefile eagle-1.0.4/driver/user/Makefile
--- eagle-1.0.4.orig/driver/user/Makefile	Wed Jun  4 00:40:37 2003
+++ eagle-1.0.4/driver/user/Makefile	Wed Jul  9 19:40:18 2003
@@ -15,19 +15,19 @@
 	gcc $(CFLAGS) adictrl.c -o adictrl
 
 install : adictrl sagemf800.conf
-	mkdir -p $(CONFIGDIR)
-	$(INSTALLER) -c -m 0755 -o root -g root adictrl $(INSTALLDIR)
-	$(INSTALLER) -c -m 0755 -o root -g root showstat $(INSTALLDIR)
-	$(INSTALLER) -c -m 0755 -o root -g root sagemf800.conf $(CONFIGDIR)/adiusbadsl.conf
-#	$(INSTALLER) -c -m 0755 -o root -g root CMVep.txt $(CONFIGDIR)/
-#	$(INSTALLER) -c -m 0755 -o root -g root CMVei.txt $(CONFIGDIR)/
+	$(INSTALLER) -d $(DESTDIR)/$(CONFIGDIR)
+	$(INSTALLER) adictrl $(DESTDIR)/$(INSTALLDIR)
+	$(INSTALLER) showstat $(DESTDIR)/$(INSTALLDIR)
+	$(INSTALLER) sagemf800.conf $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf
+	$(INSTALLER) CMVep.txt $(DESTDIR)/$(CONFIGDIR)
+	$(INSTALLER) CMVei.txt $(DESTDIR)/$(CONFIGDIR)
 
 uninstall:
-	rm -f $(INSTALLDIR)/adictrl
-	rm -f $(INSTALLDIR)/showstat
-	rm -f $(CONFIGDIR)/adiusbadsl.conf
-#	rm -f $(CONFIGDIR)/CMVep.txt
-#	rm -f $(CONFIGDIR)/CMVei.txt
+	rm -f $(DESTDIR)/$(INSTALLDIR)/adictrl
+	rm -f $(DESTDIR)/$(INSTALLDIR)/showstat
+	rm -f $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf
+	rm -f $(DESTDIR)/$(CONFIGDIR)/CMVep.txt
+	rm -f $(DESTDIR)/$(CONFIGDIR)/CMVei.txt
 
 
 
diff -uNr eagle-1.0.4.orig/pppoa/Makefile eagle-1.0.4/pppoa/Makefile
--- eagle-1.0.4.orig/pppoa/Makefile	Thu Apr 24 20:42:06 2003
+++ eagle-1.0.4/pppoa/Makefile	Wed Jul  9 19:35:04 2003
@@ -45,10 +45,10 @@
 	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o debug.c
 
 install: pppoa
-	$(INSTALLER) -m 775 -o root -g root pppoa /usr/sbin
+	$(INSTALLER) pppoa $(DESTDIR)/usr/sbin
 
 uninstall:
-	rm -f /usr/sbin/pppoa
+	rm -f $(DESTDIR)/usr/sbin/pppoa
 
 clean:
 	rm -f *.o pppoa 
diff -uNr eagle-1.0.4.orig/scripts/Makefile eagle-1.0.4/scripts/Makefile
--- eagle-1.0.4.orig/scripts/Makefile	Wed Jun 18 23:58:02 2003
+++ eagle-1.0.4/scripts/Makefile	Wed Jul  9 19:44:40 2003
@@ -14,29 +14,29 @@
 	./makescripts
 
 install: userscripts
-	mkdir -p $(HOTPLUGDIR)/usb
+	mkdir -p $(DESTDIR)/$(HOTPLUGDIR)/usb
 	@if [ -f pap-secrets ]; then \
-		$(INSTALLER) -c -m 0600 -o root -g root pap-secrets $(PPPDIR) ; \
+		$(INSTALLER) -c pap-secrets $(DESTDIR)/$(PPPDIR) ; \
 	fi
 	@if [ -f chap-secrets ]; then \
-		$(INSTALLER) -c -m 0600 -o root -g root chap-secrets $(PPPDIR) ; \
+		$(INSTALLER) -c chap-secrets $(DESTDIR)/$(PPPDIR) ; \
 	fi
 	@if [ -f options.adsl ]; then \
-		$(INSTALLER) -c -m 0644 -o root -g root options.adsl $(PPPDIR) ; \
+		$(INSTALLER) -c options.adsl $(DESTDIR)/$(PPPDIR) ; \
 	fi
-	$(INSTALLER) -c -m 0554 -o root -g root hotplug/adiusb* $(HOTPLUGDIR)/usb
+	$(INSTALLER) -c hotplug/adiusb* $(DESTDIR)/$(HOTPLUGDIR)/usb
 	@if [ -f usb.usermap ]; then \
-		$(INSTALLER) -c -m 0644 -o root -g root usb.usermap $(HOTPLUGDIR) ; \
+		$(INSTALLER) -c usb.usermap $(DESTDIR)/$(HOTPLUGDIR) ; \
 	else \
-		$(INSTALLER) -c -m 0644 -o root -g root usb.usermap.local $(HOTPLUGDIR) && \
+		$(INSTALLER) -c usb.usermap.local $(DESTDIR)/$(HOTPLUGDIR) && \
 		/usr/sbin/update-usb.usermap ; \
 	fi
-	$(INSTALLER) -c -m 0554 -o root -g root adsl/* $(INSTALLDIR)
+	$(INSTALLER) -c  adsl/* $(DESTDIR)/$(INSTALLDIR)
 	rm -f options.adsl options.mire pap-secrets chap-secrets usb.usermap usb.usermap.local
 
 uninstall:
-	rm -f $(PPPDIR)/options.mire
-	rm -f $(HOTPLUGDIR)/usb/adiusb*
+	rm -f $(DESTDIR)/$(PPPDIR)/options.mire
+	rm -f $(DESTDIR)/$(HOTPLUGDIR)/usb/adiusb*
 	./scriptUninst
 
 clean:
--- eagle-1.0.4/scripts/makescripts~	Wed Jun 18 21:58:02 2003
+++ eagle-1.0.4/scripts/makescripts	Wed Jul  9 18:20:05 2003
@@ -28,12 +28,6 @@
 echo $GREETING
 echo
 
-# Check we are root:
-if [ `id -ur` != 0 ] ; then
-	echo $ROOTMSG
-	echo
-	exit 1
-fi
 
 echo -en $DEGROUPEMSG
 read REP
Commit	Line	Data
9029c9da	1	diff -uNr eagle-1.0.4.orig/driver/Makefile eagle-1.0.4/driver/Makefile
	2	--- eagle-1.0.4.orig/driver/Makefile Wed Jun 18 23:58:41 2003
	3	+++ eagle-1.0.4/driver/Makefile Wed Jul 9 19:41:39 2003
	4	@@ -106,7 +106,7 @@
	5	install: driver installfirmware installuser
	6	mkdir -p $(INSTALLDIR) && \
	7	mkdir -p $(CONFDIR) && \
	8	- $(INSTALLER) -m 0664 -o root -g root $(MODULE).o $(INSTALLDIR)/$(MODULE).o && \
	9	+ $(INSTALLER) $(MODULE).o $(DESTDIR)/$(INSTALLDIR)/$(MODULE).o && \
	10	/sbin/depmod -a
	11
	12	uninstall:
	13	diff -uNr eagle-1.0.4.orig/driver/firmware/Makefile eagle-1.0.4/driver/firmware/Makefile
	14	--- eagle-1.0.4.orig/driver/firmware/Makefile Wed Jun 4 01:09:37 2003
	15	+++ eagle-1.0.4/driver/firmware/Makefile Wed Jul 9 19:42:20 2003
	16	@@ -33,12 +33,12 @@
	17	gcc $(CFLAGS) builddsp.c -o buildDSP
	18
	19	install : firmware.bin DSPcode.bin
	20	- mkdir -p $(CONFIGDIR)
	21	- $(INSTALLER) -c -m 0664 -o root -g root *.bin $(CONFIGDIR)
	22	+ mkdir -p $(DESTDIR)/$(CONFIGDIR)
	23	+ $(INSTALLER) *.bin $(DESTDIR)/$(CONFIGDIR)
	24
	25	uninstall:
	26	- rm -f $(CONFIGDIR)/DSPcode.bin
	27	- rm -f $(CONFIGDIR)/firmware.bin
	28	+ rm -f $(DESTDIR)/$(CONFIGDIR)/DSPcode.bin
	29	+ rm -f $(DESTDIR)/$(CONFIGDIR)/firmware.bin
	30
	31	clean :
	32	rm -f firmware.bin buildFirmware buildDSP DSPcode.bin
	33	diff -uNr eagle-1.0.4.orig/driver/user/Makefile eagle-1.0.4/driver/user/Makefile
	34	--- eagle-1.0.4.orig/driver/user/Makefile Wed Jun 4 00:40:37 2003
	35	+++ eagle-1.0.4/driver/user/Makefile Wed Jul 9 19:40:18 2003
	36	@@ -15,19 +15,19 @@
	37	gcc $(CFLAGS) adictrl.c -o adictrl
	38
	39	install : adictrl sagemf800.conf
	40	- mkdir -p $(CONFIGDIR)
	41	- $(INSTALLER) -c -m 0755 -o root -g root adictrl $(INSTALLDIR)
	42	- $(INSTALLER) -c -m 0755 -o root -g root showstat $(INSTALLDIR)
	43	- $(INSTALLER) -c -m 0755 -o root -g root sagemf800.conf $(CONFIGDIR)/adiusbadsl.conf
	44	-# $(INSTALLER) -c -m 0755 -o root -g root CMVep.txt $(CONFIGDIR)/
	45	-# $(INSTALLER) -c -m 0755 -o root -g root CMVei.txt $(CONFIGDIR)/
	46	+ $(INSTALLER) -d $(DESTDIR)/$(CONFIGDIR)
	47	+ $(INSTALLER) adictrl $(DESTDIR)/$(INSTALLDIR)
	48	+ $(INSTALLER) showstat $(DESTDIR)/$(INSTALLDIR)
	49	+ $(INSTALLER) sagemf800.conf $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf
	50	+ $(INSTALLER) CMVep.txt $(DESTDIR)/$(CONFIGDIR)
	51	+ $(INSTALLER) CMVei.txt $(DESTDIR)/$(CONFIGDIR)
	52
	53	uninstall:
	54	- rm -f $(INSTALLDIR)/adictrl
	55	- rm -f $(INSTALLDIR)/showstat
	56	- rm -f $(CONFIGDIR)/adiusbadsl.conf
	57	-# rm -f $(CONFIGDIR)/CMVep.txt
	58	-# rm -f $(CONFIGDIR)/CMVei.txt
	59	+ rm -f $(DESTDIR)/$(INSTALLDIR)/adictrl
	60	+ rm -f $(DESTDIR)/$(INSTALLDIR)/showstat
	61	+ rm -f $(DESTDIR)/$(CONFIGDIR)/adiusbadsl.conf
	62	+ rm -f $(DESTDIR)/$(CONFIGDIR)/CMVep.txt
	63	+ rm -f $(DESTDIR)/$(CONFIGDIR)/CMVei.txt
	64
65
66
67	diff -uNr eagle-1.0.4.orig/pppoa/Makefile eagle-1.0.4/pppoa/Makefile
68	--- eagle-1.0.4.orig/pppoa/Makefile Thu Apr 24 20:42:06 2003
69	+++ eagle-1.0.4/pppoa/Makefile Wed Jul 9 19:35:04 2003
70	@@ -45,10 +45,10 @@
71	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o debug.c
72
73	install: pppoa
74	- $(INSTALLER) -m 775 -o root -g root pppoa /usr/sbin
75	+ $(INSTALLER) pppoa $(DESTDIR)/usr/sbin
76
77	uninstall:
78	- rm -f /usr/sbin/pppoa
79	+ rm -f $(DESTDIR)/usr/sbin/pppoa
80
81	clean:
82	rm -f *.o pppoa
83	diff -uNr eagle-1.0.4.orig/scripts/Makefile eagle-1.0.4/scripts/Makefile
84	--- eagle-1.0.4.orig/scripts/Makefile Wed Jun 18 23:58:02 2003
85	+++ eagle-1.0.4/scripts/Makefile Wed Jul 9 19:44:40 2003
86	@@ -14,29 +14,29 @@
87	./makescripts
88
89	install: userscripts
90	- mkdir -p $(HOTPLUGDIR)/usb
91	+ mkdir -p $(DESTDIR)/$(HOTPLUGDIR)/usb
92	@if [ -f pap-secrets ]; then \
93	- $(INSTALLER) -c -m 0600 -o root -g root pap-secrets $(PPPDIR) ; \
94	+ $(INSTALLER) -c pap-secrets $(DESTDIR)/$(PPPDIR) ; \
95	fi
96	@if [ -f chap-secrets ]; then \
97	- $(INSTALLER) -c -m 0600 -o root -g root chap-secrets $(PPPDIR) ; \
98	+ $(INSTALLER) -c chap-secrets $(DESTDIR)/$(PPPDIR) ; \
99	fi
100	@if [ -f options.adsl ]; then \
101	- $(INSTALLER) -c -m 0644 -o root -g root options.adsl $(PPPDIR) ; \
102	+ $(INSTALLER) -c options.adsl $(DESTDIR)/$(PPPDIR) ; \
103	fi
104	- $(INSTALLER) -c -m 0554 -o root -g root hotplug/adiusb* $(HOTPLUGDIR)/usb
105	+ $(INSTALLER) -c hotplug/adiusb* $(DESTDIR)/$(HOTPLUGDIR)/usb
106	@if [ -f usb.usermap ]; then \
107	- $(INSTALLER) -c -m 0644 -o root -g root usb.usermap $(HOTPLUGDIR) ; \
108	+ $(INSTALLER) -c usb.usermap $(DESTDIR)/$(HOTPLUGDIR) ; \
109	else \
110	- $(INSTALLER) -c -m 0644 -o root -g root usb.usermap.local $(HOTPLUGDIR) && \
111	+ $(INSTALLER) -c usb.usermap.local $(DESTDIR)/$(HOTPLUGDIR) && \
112	/usr/sbin/update-usb.usermap ; \
113	fi
114	- $(INSTALLER) -c -m 0554 -o root -g root adsl/* $(INSTALLDIR)
115	+ $(INSTALLER) -c adsl/* $(DESTDIR)/$(INSTALLDIR)
116	rm -f options.adsl options.mire pap-secrets chap-secrets usb.usermap usb.usermap.local
117
118	uninstall:
119	- rm -f $(PPPDIR)/options.mire
120	- rm -f $(HOTPLUGDIR)/usb/adiusb*
121	+ rm -f $(DESTDIR)/$(PPPDIR)/options.mire
122	+ rm -f $(DESTDIR)/$(HOTPLUGDIR)/usb/adiusb*
123	./scriptUninst
124
125	clean:
83e7f0aa MM	126	--- eagle-1.0.4/scripts/makescripts~ Wed Jun 18 21:58:02 2003
	127	+++ eagle-1.0.4/scripts/makescripts Wed Jul 9 18:20:05 2003
	128	@@ -28,12 +28,6 @@
	129	echo $GREETING
	130	echo
	131
	132	-# Check we are root:
	133	-if [ `id -ur` != 0 ] ; then
	134	- echo $ROOTMSG
	135	- echo
	136	- exit 1
	137	-fi
	138
	139	echo -en $DEGROUPEMSG
	140	read REP