From a3ee46908ed9a56bc2234848d55ef753f179eb15 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 31 Jan 2003 16:12:33 +0000 Subject: [PATCH] r3895: Automatic commit for debian_version_4_1_0-1 --- debian/control | 8 ++++---- debian/rules | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 5f776db..ab2e9c0 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc Conflicts: ctsim-pentium4, ctsim-athlon -Description: Computed Tomograpy Simulator +Description: Computed tomograpy simulator CTSim provides an interactive computed tomography simulator. Computed tomography is the technique of estimating the interior of an object by on measuring x-ray absorption through an object. @@ -26,7 +26,7 @@ Architecture: i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc Conflicts: ctsim, ctsim-athlon -Description: Computed Tomograpy Simulator (Pentium 4 Optimized) +Description: Computed tomograpy simulator (Pentium 4 optimized) CTSim provides an interactive computed tomography simulator. Computed tomography is the technique of estimating the interior of an object by on measuring x-ray absorption through an object. @@ -44,7 +44,7 @@ Architecture: i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc Conflicts: ctsim, ctsim-pentium4 -Description: Computed Tomograpy Simulator (Pentium 4 Optimized) +Description: Computed tomograpy simulator (Athlon optimized) CTSim provides an interactive computed tomography simulator. Computed tomography is the technique of estimating the interior of an object by on measuring x-ray absorption through an object. @@ -70,7 +70,7 @@ Section: doc Architecture: all Recommends: ctsim Replaces: ctsim (<< 3.5.3) -Description: Computed Tomograpy Simulator +Description: Documentation for ctsim package This package provides HTML and PDF documentation files for CTSim, a computed tomography simulator. diff --git a/debian/rules b/debian/rules index 1aa2020..0e73ff4 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. + ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn touch configure-stamp @@ -44,6 +45,7 @@ build-arch: configure-stamp build-arch-stamp build-arch-stamp: dh_testdir # Add here commands to compile the package. + $(MAKE) all touch build-arch-stamp build-indep: configure-stamp build-indep-stamp @@ -76,10 +78,10 @@ install: build dh_installdirs # dh_installdirs -p $(pkg-help) $(ctsim-shared) - ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn - $(MAKE) all ${MAKE} install -ifeq ($(host_arch),i386) + # +ifneq (,$(findstring i386,$(host_Arch))) + echo Building CPU-specific i386 flavors # Pentium 4 ${MAKE} clean ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4 @@ -90,14 +92,14 @@ ifeq ($(host_arch),i386) ./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon $(MAKE) all ${MAKE} install -endif - # Add here commands to install the package into debian/ctsim. - dh_installdirs -p $(pkg) $(pixmap-dir) dh_installdirs -p $(pkg-p4) $(pixmap-dir) dh_installdirs -p $(pkg-athlon) $(pixmap-dir) - dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-athlon) debian/ctsim.xpm $(pixmap-dir) +endif + # Add here commands to install the package into debian/ctsim. + dh_installdirs -p $(pkg) $(pixmap-dir) + dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-help) docs/ctsim.htb $(ctsim-shared) dh_install -p $(pkg-doc) docs/html $(doc-dir) dh_link -p $(pkg-doc) $(doc-dir)/html/$(pkg)_contents.html $(doc-dir)/html/index.html -- 2.34.1