X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=trc6500-master-file%2FMakefile;h=6573fe1c066891cc1e885248da688f20dc6b2d7c;hb=e72d9c2e658e63c5c07368d2906eff313d44ca98;hp=dabfe20bd58cbe6f44c8e3bae2ca07f6d8404c82;hpb=7be646c04fa4f7e295f9da45dfbe93da33650e6f;p=debian6500.git

diff --git a/trc6500-master-file/Makefile b/trc6500-master-file/Makefile
index dabfe20..6573fe1 100644
--- a/trc6500-master-file/Makefile
+++ b/trc6500-master-file/Makefile
@@ -2,16 +2,13 @@
 
 DIR = ../master/
 
-CONFIGDIR = debian/
-
 FILES = $(shell cd $(DIR); find etc/ -type f)
 
 TARGET = ../$(MODULE)_$(VERSION)_$(ARCH).deb
 
 OBJECTS = deb/DEBIAN/preinst \
 	  deb/DEBIAN/postrm \
-	  deb/DEBIAN/postinst \
-	  deb/opt/script
+	  deb/DEBIAN/postinst
 
 SHELL=/bin/bash
 MODULE = $(shell basename `pwd`)
@@ -20,7 +17,7 @@ ARCH = all
 .DEFAULT: all
 .PHONY: clean deb all
 
-VERSION = $(shell awk '/^$(MODULE)/ { gsub(/[()]/, ""); print $$2; exit }' debian/debian-changelog)
+VERSION = $(shell awk '/^$(MODULE)/ { gsub(/[()]/, ""); print $$2; exit }' changelog)
 
 
 all: $(TARGET) deb
@@ -32,7 +29,7 @@ deb:
 	rm -rf deb
 	mkdir --parent deb/etc/webconfig/ deb/etc/default/ deb/DEBIAN
 
-deb/DEBIAN/preinst: debian/debian-preinst deb $(addprefix $(DIR)/, $(FILES)) $(MAKEFILE_LIST)
+deb/DEBIAN/preinst: preinst deb $(addprefix $(DIR)/, $(FILES)) $(MAKEFILE_LIST)
 	rm -f $@
 	cat $< > $@~
 	for f in $(FILES); do echo '[ -f "/'$$f'" ] && dpkg-divert --add /'$$f; done >>$@~
@@ -40,7 +37,7 @@ deb/DEBIAN/preinst: debian/debian-preinst deb $(addprefix $(DIR)/, $(FILES)) $(M
 	chmod +x $@~
 	mv $@~ $@
 
-deb/DEBIAN/postrm: debian/debian-postrm deb $(addprefix $(DIR)/, $(FILES)) $(MAKEFILE_LIST)
+deb/DEBIAN/postrm: postrm deb $(addprefix $(DIR)/, $(FILES)) $(MAKEFILE_LIST)
 	rm -f $@
 	cat $< > $@~
 	for f in $(FILES); do echo '[ -f "/'$$f'" ] && dpkg-divert --remove /'$$f; done >>$@~
@@ -48,17 +45,13 @@ deb/DEBIAN/postrm: debian/debian-postrm deb $(addprefix $(DIR)/, $(FILES)) $(MAK
 	chmod +x $@~
 	mv $@~ $@
 
-deb/DEBIAN/postinst: debian/debian-postinst deb
+deb/DEBIAN/postinst: postinst deb
 	cp $< $@
 
-deb/opt/script: script deb
-	mkdir -p $@
-	cp $</* $@
-
 $(TARGET): deb $(OBJECTS)
-	sed s/@@version@@/$(VERSION)/ debian/debian-control > deb/DEBIAN/control
+	sed s/@@version@@/$(VERSION)/ control > deb/DEBIAN/control
 	mkdir -p deb/usr/share/doc/$(MODULE)
-	cp debian/debian-changelog deb/usr/share/doc/$(MODULE)/changelog
+	cp changelog deb/usr/share/doc/$(MODULE)/changelog
 	cp -r $(DIR)/* deb/
 	fakeroot dpkg --build deb
 	mv deb.deb $@