diff options
author | jbj <devnull@localhost> | 2000-02-27 23:40:36 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2000-02-27 23:40:36 +0000 |
commit | a217056e70d56a4eb666bda599d89ba2a4e0a014 (patch) | |
tree | 1a1578eae41837852321ce24f1f71c5125396d7e /python | |
parent | 2fdcb4810f0edef7fbb11eb60e7c7336982419c6 (diff) | |
download | rpm-a217056e70d56a4eb666bda599d89ba2a4e0a014.tar.gz rpm-a217056e70d56a4eb666bda599d89ba2a4e0a014.tar.bz2 rpm-a217056e70d56a4eb666bda599d89ba2a4e0a014.zip |
Permit building w/o libbz2.a.
In popt, check for building within the rpm tree before requiring GNU gettext.
CVS patchset: 3595
CVS date: 2000/02/27 23:40:36
Diffstat (limited to 'python')
-rw-r--r-- | python/Makefile.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/python/Makefile.in b/python/Makefile.in index 083ee4c2a..12f9aef88 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -197,7 +196,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/hash.P .deps/rpmmodule.P .deps/upgrade.P SOURCES = $(librpmmodule_la_SOURCES) $(rpmmodule_so_SOURCES) @@ -272,8 +271,8 @@ install-pythonPROGRAMS: $(python_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(pythondir) @list='$(python_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -325,7 +324,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -386,7 +385,7 @@ uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(pythondir) |