RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 14-May-2009 21:20:54
Branch: rpm-5_2 Handle: 2009051419205400
Modified files: (Branch: rpm-5_2)
rpm/tools Makefile.am
Log:
don't repeat same code in both clauses, just move it before..
Summary:
Revision Changes Path
2.120.2.3 +1 -2 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.120.2.2 -r2.120.2.3 Makefile.am
--- rpm/tools/Makefile.am 14 May 2009 19:02:19 -0000 2.120.2.2
+++ rpm/tools/Makefile.am 14 May 2009 19:20:54 -0000 2.120.2.3
@@ -152,9 +152,9 @@
endif
install-data-local:
+ @[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs)
$(DESTDIR)$(pkgbindir)
if WITH_DB_INTERNAL
if WITH_DB_TOOLS_INTEGRATED
- @[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs)
$(DESTDIR)$(pkgbindir)
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(pkgbinPROGRAMS_INSTALL) \
$(builddir)/db_tool $(DESTDIR)$(pkgbindir)/db_tool
for tool in . $(my_DB_TOOLS); do \
@@ -163,7 +163,6 @@
ln $(DESTDIR)$(pkgbindir)/db_tool
$(DESTDIR)$(pkgbindir)/$$tool; \
done
else
- @[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs)
$(DESTDIR)$(pkgbindir)
for tool in . $(my_DB_TOOLS); do \
test ".$$tool" = .. && continue; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(pkgbinPROGRAMS_INSTALL) \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
