[med-svn] r4816 - trunk/packages/dicom3tools/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-05-23 10:49:45 +0000 (Sun, 23 May 2010)
New Revision: 4816

Modified:
   trunk/packages/dicom3tools/trunk/debian/rules
Log:
trying to fix compilation of X11 executables

Modified: trunk/packages/dicom3tools/trunk/debian/rules
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/rules	2010-05-23 10:30:59 UTC (rev 4815)
+++ trunk/packages/dicom3tools/trunk/debian/rules	2010-05-23 10:49:45 UTC (rev 4816)
@@ -28,7 +28,7 @@
 
 CFLAGS = -Wall -g
 
-ifeq (,$(findstring regression_testing_dicom,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring regression_testing_dicom,$(DEB_BUILD_OPTIONS)))
 DCLIST = -name andump\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\*
 IMAKEFLAGS = -DDefaultUIDRoot=1.3.6.1.4.1.35045
 else
@@ -36,10 +36,11 @@
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	OPT_FLAGS = -O0
 else
-	CFLAGS += -O2
+	OPT_FLAGS = -O2
 endif
+CFLAGS += $(OPT_FLAGS)
 
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
@@ -48,7 +49,7 @@
 	find . -name \*.awk -exec sed -i -e 's@/dev/tty@/dev/stderr at g' {} \;
 	# Add here commands to configure the package.
 	sh Configure
-	imake -I./config -DTmpPath=/tmp -DOptimizeLevel=$(OPT_FLAGS) $(IMAKEFLAGS)
+	imake -I./config -DTmpPath=/tmp -DOptimizeLevel=$(OPT_FLAGS) $(IMAKEFLAGS) -DSystemIncludeOption=-I/usr/include
 	touch configure-stamp
 
 build: build-stamp