[med-svn] r3090 - trunk/packages/igstk/trunk/debian

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2009-02-08 06:18:47 +0000 (Sun, 08 Feb 2009)
New Revision: 3090

Modified:
   trunk/packages/igstk/trunk/debian/rules
Log:
fixed configure issue


Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules	2009-02-08 01:35:13 UTC (rev 3089)
+++ trunk/packages/igstk/trunk/debian/rules	2009-02-08 06:18:47 UTC (rev 3090)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+export DH_VERBOSE=0
 
 PACKAGE=igstk
 
@@ -25,11 +25,9 @@
               -DIGSTK_USE_FLTK:BOOL=ON \
               -DQT_MOC_EXECUTABLE:PATH=/usr/bin/moc-qt4 \
               -DQT_UIC_EXECUTABLE:PATH=/usr/bin/uic-qt4 \
-              -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake \
-              -DBUILDNAME:STRING=SID \
-              -DSITE:STRING=DEBIAN \
-              -DCTEST_ENVIRONMENT="DISPLAY=:0"
+              -DQT_QMAKE_EXECUTABLE:PATH=/usr/bin/qmake
 
+
 # if using precompiled static library provided by Claron Tech.:
 #              -DIGSTK_USE_MicronTracker:BOOL=ON \
 #              -DMTC_INCLUDE_DIRECTORY:PATH=/tmp/MTC/Dist \
@@ -42,6 +40,7 @@
 
 
 configure: configure-stamp
+
 configure-stamp: patch-stamp
 	dh_testdir
 
@@ -55,13 +54,13 @@
 	cd $(SHARED_BUILD_PATH) \
             && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
 
-	touch configure-stamp
+	touch $@
 
 
 build: build-arch
 
 build-arch: build-arch-stamp
-build-arch-stamp: configure
+build-arch-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -73,14 +72,13 @@
 	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
 
         # perform tests ('-' ignores return values)
-#       cd $(STATIC_BUILD_PATH) && ctest -S ../debian/ctest_config.cmake -VV
 #       - cd $(STATIC_BUILD_PATH) && ctest -D Nightly -VV
-	- cd $(STATIC_BUILD_PATH) && ctest -VV
+	- cd $(STATIC_BUILD_PATH) && ctest -V
 
 	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: configure
+build-indep-stamp: configure-stamp
 	dh_testdir
 
 	# build documentation
@@ -117,7 +115,7 @@
 	cd $(STATIC_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# install development files
-	dh_install -plibigstk3-dev debian/tmp/usr/include/IGSTK/*    usr/include/IGSTK/
+	dh_install -plibigstk3-dev  debian/tmp/usr/include/IGSTK/*    usr/include/IGSTK/
 
 	# install libs and *cmake files
 	dh_install -plibigstk3-dev  debian/tmp/usr/lib/IGSTK/*.a      usr/lib