X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=a7d1b80b50ac6d4bc87547c3c92ae5d6018dd70c;hb=2e7dc69c3a63bac0a9df1abbcece62c03112a1ab;hp=8f1cefcb3405a45a194eb2f581fa68c7c5085270;hpb=39597146fe0bb2cb6122439fc0c2b93abc095c02;p=senf.git

diff --git a/debian/rules b/debian/rules
index 8f1cefc..a7d1b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,50 +19,43 @@ export debian_build
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g
-
 CONCURRENCY_LEVEL ?= 1
 export CONCURRENCY_LEVEL
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 destdir=$(CURDIR)/debian/tmp
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 #	Add here commands to configure the package.
-	rm -f Doxyfile.local SConfig local_config.hh
+#	rm -f Doxyfile.local SConstruct.local senf/local_config.hh
 	scons prepare
 #       If needed, we could create new files 'Doxyfile.local',
-#       'SConfig' and/or 'local_config.hh' here.  We don't remove them
-#       in 'clean' to allow building a source package from an
-#       individually configured svn working copy. (The files are ignored
-#       by dpkg-buildpackge because of appropriate -I arguments provided 
-#       by 'scons deb' and 'scons debsrc'
+#       'SConstruct.local' and/or 'local_config.hh' here.  We don't
+#       remove them in 'clean' to allow building a source package from
+#       an individually configured svn working copy. (The files are
+#       ignored by dpkg-buildpackge because of appropriate -I
+#       arguments provided by 'scons deb' and 'scons debsrc'
 	touch configure-stamp
 
 build: build-arch build-indep
 
-build-arch: build-arch-final build-arch-debug
+build-arch: build-arch-debug build-arch-final
 
 build-arch-final: build-arch-final-stamp
 build-arch-final-stamp: configure-stamp
 # 	Add here commands to compile the arch part of the package.
 	scons -j $(CONCURRENCY_LEVEL) default final=1
-	scons $(destdir)/usr/lib final=1 PREFIX='$(destdir)/usr'
+	scons $(destdir)/usr/lib $(destdir)/usr/bin final=1 syslayout=1 \
+		PREFIX='$(destdir)/usr' OBJINSTALLDIR='$$PREFIX/lib/senf'
 	touch $@
 
 build-arch-debug: build-arch-debug-stamp
 build-arch-debug-stamp: configure-stamp
 # 	Add here commands to compile the arch part of the package.
 	scons -j $(CONCURRENCY_LEVEL) default LIBADDSUFFIX=_g OBJADDSUFFIX=_g
-	scons $(destdir)/usr/lib LIBADDSUFFIX=_g OBJADDSUFFIX=_g \
-		PREFIX='$(destdir)/usr' OBJINSTALLDIR='$$LIBINSTALLDIR/debug'
+	scons $(destdir)/usr/lib syslayout=1 LIBADDSUFFIX=_g OBJADDSUFFIX=_g \
+		PREFIX='$(destdir)/usr' OBJINSTALLDIR='$$PREFIX/lib/senf/debug'
 	touch $@
 
 build-indep: build-indep-stamp
@@ -72,10 +65,9 @@ build-indep-stamp: configure-stamp
 	scons all_docs
 	scons linklint
 	scons fixlinks
-	scons $(destdir)/usr/include $(destdir)/usr/share/doc \
+	scons $(destdir)/usr/include $(destdir)/usr/share/doc syslayout=1 \
 		PREFIX='$(destdir)/usr' \
-		DOCINSTALLDIR='$$PREFIX/share/doc/libsenf-doc/html' \
-		INCLUDEINSTALLDIR='$$PREFIX/include/senf' 
+		DOCINSTALLDIR='$$PREFIX/share/doc/libsenf-doc/html'
 #	Remove all the files not really needed from the documentation directories
 	find $(destdir)/usr/share/doc/libsenf-doc/html \
 		-type f ! -regex '.*\.\(html\|css\|png\|php\|idx\|tag\)' | xargs rm -f