[med-svn] r11562 - trunk/packages/conquest-dicom-server/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-07-05 08:48:25 +0000 (Thu, 05 Jul 2012)
New Revision: 11562

Modified:
   trunk/packages/conquest-dicom-server/trunk/debian/
   trunk/packages/conquest-dicom-server/trunk/debian/rules
Log:
Fixup d/rules


Property changes on: trunk/packages/conquest-dicom-server/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 08:15:25 UTC (rev 11561)
+++ trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 08:48:25 UTC (rev 11562)
@@ -7,14 +7,12 @@
 	dh $@ --parallel
 
 jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a:
-	cd jasper-1.900.1-6ct
-	./configure --disable-libjpeg
-	$(MAKE)
+	(cd jasper-1.900.1-6ct && ./configure --disable-libjpeg)
+	$(MAKE) -C jasper-1.900.1-6ct
 
 jpeg-6c/libjpeg.a:
-	cd jpeg-6c/
-	./configure
-	$(MAKE)
+	(cd jpeg-6c && ./configure)
+	$(MAKE) -C jpeg-6c
 
 dgate: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a
 	g++ $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS)