* Minor optimization: swap instead of assign.

[ginac.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index a6d80b1937391037d2704a659c36c62c91522f25..4834145346ccc94c982291d6bbc5425fc99cd39b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        export CXXFLAGS = -O0
 else
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        export CXXFLAGS = -O0
 else

-       export CXXFLAGS = -O2 -fomit-frame-pointer -finline-limit=1200
+       export CXXFLAGS = -O2 -finline-limit=1200

 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s


@@ -26,14 +26,15 @@ endif
 config.status: configure
        dh_testdir
        # Add here commands to configure the package.
 config.status: configure
        dh_testdir
        # Add here commands to configure the package.

-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+       # The Makefile is removed on error in order to prevent the build at this early stage.
+       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info || rm -f Makefile

 
 build: build-arch
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
        # Add here commands to compile the arch part of the package.
 
 build: build-arch
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
        # Add here commands to compile the arch part of the package.

-       $(MAKE) prefix=$(CURDIR)/debian/tmp/usr infodir=$(CURDIR)/debian/tmp/usr/share/info mandir=$(CURDIR)/debian/tmp/usr/share/man
+       $(MAKE)

 
 clean:
        dh_testdir
 
 clean:
        dh_testdir


@@ -51,8 +52,8 @@ install-arch:
        # Add here commands to install the arch part of the package into 
        # debian/tmp.
        $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
        # Add here commands to install the arch part of the package into 
        # debian/tmp.
        $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr

-       mkdir -p $(CURDIR)/debian/tmp/usr/X11R6/include/X11/pixmaps
-       cp $(CURDIR)/debian/ginac.xpm $(CURDIR)/debian/tmp/usr/X11R6/include/X11/pixmaps/
+       mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps
+       cp $(CURDIR)/debian/ginac.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/

 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi


@@ -71,7 +72,7 @@ binary-common:
        dh_compress
        dh_fixperms
        dh_makeshlibs
        dh_compress
        dh_fixperms
        dh_makeshlibs

-       dh_shlibdeps --libpackage=libginac1.1 -l debian/libginac1.1/usr/lib
+       dh_shlibdeps --libpackage=libginac1.3 -l debian/libginac1.3/usr/lib

        dh_gencontrol
        dh_installdeb
        dh_md5sums
        dh_gencontrol
        dh_installdeb
        dh_md5sums