------------------------------------------------------------
revno: 2324
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2011-01-12 16:07:14 +0100
message:
more apt-cache show -> dpkg -s, and fix one bogus dpkg -s show...
modified:
rules
=== modified file 'rules'
--- a/rules 2011-01-12 15:01:35 +0000
+++ b/rules 2011-01-12 15:07:14 +0000
@@ -786,7 +786,7 @@
CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
endif
@@ -805,8 +805,8 @@
ifeq "$(LENNY_BACKPORT)" "y"
CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s show libcommons-logging-java |
grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
CONFIGURE_FLAGS += --enable-report-builder
