From d0ff74ece5ebc093f663becb5d7513692c891222 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 4 May 2004 19:42:56 +0000 Subject: [PATCH] Use DESTDIR instead of built-root --- Makefile.in | 45 ++++++++++++++++++++++----------------------- configure.in | 8 ++------ debian/changelog | 6 ++++++ debian/rules | 5 ++--- ir-tcl.spec | 6 +++--- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1111c3f..497fcdc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ # IR toolkit for tcl/tk # (c) Index Data 1995-2004 # See the file LICENSE for details. -# $Id: Makefile.in,v 1.62 2004-04-26 09:12:50 adam Exp $ +# $Id: Makefile.in,v 1.63 2004-05-04 19:42:56 adam Exp $ SHELL=/bin/sh # IrTcl Version @@ -13,8 +13,7 @@ prefix = @prefix@ # Directory prefix with machine dependent files (executables, libraries) exec_prefix = @exec_prefix@ -# RPM Root -BUILD=@build_root@ +DESTDIR= # Install directories BINDIR=$(exec_prefix)/bin @@ -86,58 +85,58 @@ wais-tcl.o: wais-tcl.c $(CC) -c $(CFLAGS) -I$(WAISDIR)/ir $(DEFS) wais-tcl.c install.man: - $(INSTALL) -d $(BUILD)$(MANDIR)/mann - @cd doc; if [ -d $(BUILD)$(MANDIR)/mann ]; then \ + $(INSTALL) -d $(DESTDIR)$(MANDIR)/mann + @cd doc; if [ -d $(DESTDIR)$(MANDIR)/mann ]; then \ for p in *.n; do \ - $(INSTALL_DATA) $$p $(BUILD)$(MANDIR)/mann; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(MANDIR)/mann; \ done; \ fi install: @ALL_SPEC@ - $(INSTALL) -d $(BUILD)$(IRTCLDIR)/formats - $(INSTALL) -d $(BUILD)$(IRTCLDIR)/bitmaps - $(INSTALL) -d $(BUILD)$(IRTCLDIR)/doc - $(INSTALL) -d $(BUILD)$(BINDIR) + $(INSTALL) -d $(DESTDIR)$(IRTCLDIR)/formats + $(INSTALL) -d $(DESTDIR)$(IRTCLDIR)/bitmaps + $(INSTALL) -d $(DESTDIR)$(IRTCLDIR)/doc + $(INSTALL) -d $(DESTDIR)$(BINDIR) @if [ -f ir-tcl ]; then \ - $(INSTALL_PROGRAM) ir-tcl $(BUILD)$(BINDIR); \ + $(INSTALL_PROGRAM) ir-tcl $(DESTDIR)$(BINDIR); \ fi @if [ -f @SHLIB_IRTCL@ ]; then \ - $(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(BUILD)$(IRTCLDIR); \ + $(INSTALL_PROGRAM) @SHLIB_IRTCL@ $(DESTDIR)$(IRTCLDIR); \ fi - $(INSTALL_DATA) libirtcl.a $(BUILD)$(LIBDIR) - $(INSTALL_DATA) ir-tcl.h $(BUILD)$(INCDIR) + $(INSTALL_DATA) libirtcl.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) ir-tcl.h $(DESTDIR)$(INCDIR) @if [ -f ir-tk ]; then \ - $(INSTALL_PROGRAM) ir-tk $(BUILD)$(BINDIR); \ + $(INSTALL_PROGRAM) ir-tk $(DESTDIR)$(BINDIR); \ fi @echo "#! @IRCLIENT_SHELL@ -f" >head.bak; \ cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \ - $(INSTALL_PROGRAM) client.bak $(BUILD)$(BINDIR)/irclient; \ - if [ -f $(BUILD)$(IRTCLDIR)/irtdb.tcl ]; then \ + $(INSTALL_PROGRAM) client.bak $(DESTDIR)$(BINDIR)/irclient; \ + if [ -f $(DESTDIR)$(IRTCLDIR)/irtdb.tcl ]; then \ echo "irtdb.tcl already exists"; \ echo "Installing irtdb.tcl.n"; \ cp irtdb.tcl irtdb.tcl.n; \ - $(INSTALL_DATA) irtdb.tcl.n $(BUILD)$(IRTCLDIR); \ + $(INSTALL_DATA) irtdb.tcl.n $(DESTDIR)$(IRTCLDIR); \ rm irtdb.tcl.n; \ else \ echo "Installing irtdb.tcl"; \ - $(INSTALL_DATA) irtdb.tcl $(BUILD)$(IRTCLDIR); \ + $(INSTALL_DATA) irtdb.tcl $(DESTDIR)$(IRTCLDIR); \ fi @for f in *.tcl; do \ - $(INSTALL_DATA) $$f $(BUILD)$(IRTCLDIR); \ + $(INSTALL_DATA) $$f $(DESTDIR)$(IRTCLDIR); \ done @for b in formats/*.tcl; do \ if [ -f $$b ]; then \ - $(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/formats; \ + $(INSTALL_DATA) $$b $(DESTDIR)$(IRTCLDIR)/formats; \ fi; \ done @for b in bitmaps/*; do \ if [ -f $$b ]; then \ - $(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/bitmaps; \ + $(INSTALL_DATA) $$b $(DESTDIR)$(IRTCLDIR)/bitmaps; \ fi; \ done @for b in doc/*; do \ if [ -f $$b ]; then \ - $(INSTALL_DATA) $$b $(BUILD)$(IRTCLDIR)/doc; \ + $(INSTALL_DATA) $$b $(DESTDIR)$(IRTCLDIR)/doc; \ fi; \ done diff --git a/configure.in b/configure.in index 795af52..518fcf7 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl IR toolkit for tcl/tk -dnl (c) Index Data 1996-2001 +dnl (c) Index Data 1996-2004 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.36 2002-09-13 20:23:56 adam Exp $ +dnl $Id: configure.in,v 1.37 2004-05-04 19:42:56 adam Exp $ AC_INIT(ir-tcl.h) dnl ------ Substitutions AC_SUBST(CC) @@ -18,10 +18,6 @@ AC_SUBST(ALL_SPEC) AC_SUBST(IRCLIENT_SHELL) AC_SUBST(RANLIB) dnl -dnl ------ Build root -AC_SUBST(build_root) -AC_ARG_WITH(build-root, [ --with-build-root RPM Build root],[build_root=$withval],[build_root=""]) -dnl dnl ------ Preliminary settings AC_PROG_INSTALL dnl diff --git a/debian/changelog b/debian/changelog index aa977cf..ba51d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ir-tcl (1.4.2-2) unstable; urgency=low + + * Use DESTDIR instead of --built-root. + + -- Adam Dickmeiss Tue, 4 May 2004 21:34:35 +0200 + ir-tcl (1.4.2-1) unstable; urgency=low * Upstream. diff --git a/debian/rules b/debian/rules index e9876ec..8bf2ae6 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,7 @@ configure: configure.in stamp-configure: configure dh_testdir - ./configure $(CONFIG_FLAGS) --with-build-root=$(IRTCLDIR)/debian/tmp + ./configure $(CONFIG_FLAGS) --prefix=/usr touch stamp-configure build: stamp-build @@ -59,8 +59,7 @@ stamp-install: stamp-build # Add here commands to install the package into debian/tmp. -mkdirhier debian/tmp/usr - $(MAKE) install - # $(MAKE) install prefix=`pwd`/debian/tmp/usr + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp touch stamp-install diff --git a/ir-tcl.spec b/ir-tcl.spec index 9354787..d5b94a0 100644 --- a/ir-tcl.spec +++ b/ir-tcl.spec @@ -1,6 +1,6 @@ Summary: IrTcl - Tcl extension that implements the Z39.50 protocol. Name: ir-tcl -Version: 1.4.1 +Version: 1.4.2 Release: 1 Copyright: none Group: Development/Libraries @@ -23,12 +23,12 @@ as well. %build CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --with-build-root=$RPM_BUILD_ROOT --prefix=/usr + ./configure --prefix=/usr make CFLAGS="$RPM_OPT_FLAGS" %install rm -fr $RPM_BUILD_ROOT -make install +make install DESTDIR=$RPM_BUILD_ROOT %files %defattr(-,root,root) -- 1.7.10.4