python/* needs to include "system.h".

CVS patchset: 3446
CVS date: 1999/11/30 18:39:50

diff --git a/python/Makefile.in b/python/Makefile.in
index 47097ad..ea91501 100644 (file)
--- 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 = :
@@ -134,11 +133,17 @@ __CHOWN = @__CHOWN@
 __CP = @__CP@
 __CPIO = @__CPIO@
 __ID = @__ID@
+__INSTALL = @__INSTALL@
 __MAKE = @__MAKE@
 __MKDIR = @__MKDIR@
 __MV = @__MV@
+__OBJCOPY = @__OBJCOPY@
+__OBJDUMP = @__OBJDUMP@
 __PATCH = @__PATCH@
 __RM = @__RM@
+__RSH = @__RSH@
+__SSH = @__SSH@
+__STRIP = @__STRIP@
 __TAR = @__TAR@
 l = @l@
 testdir = @testdir@
@@ -265,8 +270,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
 
@@ -318,7 +323,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 \
@@ -379,7 +384,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)
 

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 4265b8a..509cae3 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -1,3 +1,4 @@
+#ifdef DYING
 #include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -6,6 +7,9 @@
 #include <unistd.h>
 #include <glob.h>      /* XXX rpmio.h */
 #include <dirent.h>    /* XXX rpmio.h */
+#else
+#include "system.h"
+#endif
 
 #include "Python.h"
 #include "rpmlib.h"

diff --git a/python/upgrade.c b/python/upgrade.c
index 9916108..63cc9e6 100644 (file)
--- a/python/upgrade.c
+++ b/python/upgrade.c
@@ -1,3 +1,4 @@
+#ifdef DYING
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -6,6 +7,9 @@
 
 #include <glob.h>      /* XXX rpmio.h */
 #include <dirent.h>    /* XXX rpmio.h */
+#else
+#include "system.h"
+#endif
 
 #include <rpmlib.h>