CVS commit by domi:
update rules and TODO
M +2 -0 TODO 1.1.2.2
M +16 -16 rules 1.2.8.9
--- kdebindings/debian/TODO #1.1.2.1:1.1.2.2
@@ -1,2 +1,4 @@
* Auto-get python version info for dcopperl dependency
+* Make java work with gcj
+
--- kdebindings/debian/rules #1.2.8.8:1.2.8.9
@@ -18,16 +18,20 @@
objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-CONFIGURE_DEBUG_FLAG=""
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CONFIGURE_DEBUG_FLAG=--enable-debug=full
-endif
-
tmp = $(shell pwd)/debian/tmp
archlib=`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
-config=INSTALLARCHLIB=$(tmp)$(archlib) \
+perlconfig=INSTALLARCHLIB=$(tmp)$(archlib) \
INSTALLDIRS=perl INSTALLMAN1DIR=$(tmp)/usr/share/man/man1 \
INSTALLMAN3DIR=$(tmp)/usr/share/man/man3
INSTALLPRIVLIB=$(tmp)/usr/lib/perl5
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ PERLOPTIMIZE='OPTIMIZE="-O2 -g -Wall"'
+else
+ PERLOPTIMIZE=""
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
ifndef PERL
PERL=/usr/bin/perl
@@ -63,10 +67,6 @@
# run configure with build tree $(objdir)
AWK=gawk \
- ./configure $(configkde) $(XINERAMA) --with-java=/usr/lib/j2se/1.4
--with-pythondir=/usr/lib/python2.2/site-packages
-# cd kalyptus && \
-# $(MAKE) -f Makefile.cvs && \
-# ./configure $(configkde)
-# touch configure-stamp
-
+ ./configure $(configkde) --with-java=/usr/lib/fjsdk
--with-pythondir=/usr/lib/python2.3/site-packages DO_NOT_COMPILE='smoke
kalyptus xparts'
+ touch configure-stamp
build: build-stamp
@@ -77,6 +77,6 @@
$(MAKE) -C dcoppython
$(MAKE) -C dcopjava
- (cd dcopperl ; $(PERL) Makefile.PL $(config) ; make )
-# $(MAKE) -C kalyptus
+ cd dcopperl && $(PERL) Makefile.PL $(perlconfig) ;
+ make -C dcopperl $(PERLOPTTIMIZE)
touch build-stamp
@@ -127,6 +127,6 @@
$(MAKE) -C dcoppython install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C dcopperl pure_install
- $(MAKE) -C kalyptus install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dcopperl pure_install PREFIX=$(CURDIR)/debian/tmp/usr
+# $(MAKE) -C kalyptus install DESTDIR=$(CURDIR)/debian/tmp
dh_install --list-missing
