[Oval-commits] r329 - trunk/ovalint/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-01-27 06:26:24 +0000 (Sun, 27 Jan 2008)
New Revision: 329

Modified:
   trunk/ovalint/debian/patches/debian.makefile.patch
Log:
Update makefile patch. Use Javier version

Modified: trunk/ovalint/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovalint/debian/patches/debian.makefile.patch	2008-01-27 06:02:47 UTC (rev 328)
+++ trunk/ovalint/debian/patches/debian.makefile.patch	2008-01-27 06:26:24 UTC (rev 329)
@@ -1,13 +1,51 @@
 diff -urN ovalint/project/linux/Makefile ovalint-build/project/linux/Makefile
 --- ovalint/project/linux/Makefile	2008-01-23 22:01:57.000000000 +0400
-+++ ovalint-build/project/linux/Makefile	2008-01-26 17:58:26.000000000 +0400
-@@ -70,7 +70,8 @@
++++ ovalint-build/project/linux/Makefile	2008-01-27 10:26:38.000000000 +0400
+@@ -64,13 +64,14 @@
+ PACKAGE_DPKG = $(shell /usr/bin/env dpkg --version 2>/dev/null)
+ PACKAGE_MANAGERS = 
+ 
++ifneq (${PACKAGE_DPKG}, )
++	LIBS += -lapt-pkg
++	PACKAGE_MANAGERS += -DPACKAGE_DPKG
++else
+ ifneq (${PACKAGE_RPM}, )
+ 	LIBS += -lrpm -lrpmdb -lrpmio
+ 	PACKAGE_MANAGERS += -DPACKAGE_RPM
  endif
- ifneq (${PACKAGE_DPKG}, )
- 	LIBS += -lapt-pkg
+-ifneq (${PACKAGE_DPKG}, )
+-	LIBS += -lapt-pkg
 -	PACKAGE_MANAGERS += -DPACKAGE_DPKG
-+	PACKAGE_MANAGERS = -DPACKAGE_DPKG
-+	PACKAGE_RPM = 
  endif
  
  # What object code are we expecting?
+@@ -154,11 +155,12 @@
+ 	FileHashProbe.obj \
+ 	VariableProbe.obj \
+ 
++ifneq (${PACKAGE_DPKG}, )
++	OBJS += DPKGInfoProbe.obj
++else
+ ifneq (${PACKAGE_RPM}, )
+ 	OBJS += RPMInfoProbe.obj
+ endif
+-ifneq (${PACKAGE_DPKG}, )
+-	OBJS += DPKGInfoProbe.obj
+ endif
+ 
+ REL_OBJS = \
+@@ -241,11 +243,12 @@
+ 	$(BUILDDIR)/FileHashProbe.obj \
+ 	$(BUILDDIR)/VariableProbe.obj \
+ 
++ifneq (${PACKAGE_DPKG}, )
++	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
++else
+ ifneq (${PACKAGE_RPM}, )
+ 	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
+ endif
+-ifneq (${PACKAGE_DPKG}, )
+-	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
+ endif
+ 
+ # Search the output directory for object files