[Oval-commits] r349 - trunk/ovaldi/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-04-20 15:34:11 +0000 (Sun, 20 Apr 2008)
New Revision: 349

Modified:
   trunk/ovaldi/debian/patches/debian.makefile.patch
Log:
Update makefile patch

Modified: trunk/ovaldi/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.makefile.patch	2008-04-20 15:22:00 UTC (rev 348)
+++ trunk/ovaldi/debian/patches/debian.makefile.patch	2008-04-20 15:34:11 UTC (rev 349)
@@ -1,51 +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-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
--	PACKAGE_MANAGERS += -DPACKAGE_DPKG
- 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
+diff -urN ovaldi.mitre/project/linux/Makefile ovaldi.debian/project/linux/Makefile
+--- ovaldi.mitre/project/linux/Makefile	2008-04-20 20:16:34.000000000 +0500
++++ ovaldi.debian/project/linux/Makefile	2008-04-20 20:33:39.000000000 +0500
+@@ -64,13 +64,13 @@
+ PACKAGE_DPKG = $(shell /usr/bin/env dpkg --version 2>/dev/null)
+ PACKAGE_MANAGERS = 
+ 
+-ifneq (${PACKAGE_RPM}, )
+-	LIBS += -lrpm -lrpmdb -lrpmio
+-	PACKAGE_MANAGERS += -DPACKAGE_RPM
+-endif
+ ifneq (${PACKAGE_DPKG}, )
+ 	LIBS += -lapt-pkg
+ 	PACKAGE_MANAGERS += -DPACKAGE_DPKG
++else
++ifneq (${PACKAGE_RPM}, )
++	LIBS += -lrpm -lrpmdb -lrpmio
++	PACKAGE_MANAGERS += -DPACKAGE_RPM
+ endif
+ 
+ # What object code are we expecting?
+@@ -155,11 +155,11 @@
+ 	FileHashProbe.obj \
+ 	VariableProbe.obj \
+ 
+-ifneq (${PACKAGE_RPM}, )
+-	OBJS += RPMInfoProbe.obj
+-endif
+ ifneq (${PACKAGE_DPKG}, )
+ 	OBJS += DPKGInfoProbe.obj
++else
++ifneq (${PACKAGE_RPM}, )
++	OBJS += RPMInfoProbe.obj
+ endif
+ 
+ REL_OBJS = \
+@@ -243,11 +243,11 @@
+ 	$(BUILDDIR)/FileHashProbe.obj \
+ 	$(BUILDDIR)/VariableProbe.obj \
+ 
+-ifneq (${PACKAGE_RPM}, )
+-	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
+-endif
+ ifneq (${PACKAGE_DPKG}, )
+ 	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
++else
++ifneq (${PACKAGE_RPM}, )
++	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
+ endif
+ 
+ # Search the output directory for object files