diff options
| author | Martin Pool <mbp@samba.org> | 2002-09-09 07:49:25 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2002-09-09 07:49:25 +0000 |
| commit | b2536ccfdde333633f1d208a6113182aee260aab (patch) | |
| tree | 07ccc6b6058b9cfe32eec4ee086ef92507a7666a /source3/python | |
| parent | 4c471811a439bd9774835496ee9a418a32ae4519 (diff) | |
| download | samba-b2536ccfdde333633f1d208a6113182aee260aab.tar.gz samba-b2536ccfdde333633f1d208a6113182aee260aab.tar.bz2 samba-b2536ccfdde333633f1d208a6113182aee260aab.zip | |
Python's setup.py does not need to be munged by configure.in -- it is
sufficient to just pass the relevant variables to Python from the
Makefile. Therefore, remove setup.py.in.
(This used to be commit 8bebe9ee2b6bd56c297acc6b01cb0856aad1c4f3)
Diffstat (limited to 'source3/python')
| -rw-r--r-- | source3/python/.cvsignore | 1 | ||||
| -rwxr-xr-x | source3/python/setup.py (renamed from source3/python/setup.py.in) | 14 |
2 files changed, 4 insertions, 11 deletions
diff --git a/source3/python/.cvsignore b/source3/python/.cvsignore index 8ce381cd39..7e99e367f8 100644 --- a/source3/python/.cvsignore +++ b/source3/python/.cvsignore @@ -1,2 +1 @@ -setup.py *.pyc
\ No newline at end of file diff --git a/source3/python/setup.py.in b/source3/python/setup.py index 5896301245..b39ef448c1 100755 --- a/source3/python/setup.py.in +++ b/source3/python/setup.py @@ -30,21 +30,15 @@ import sys, string, os # method of adding setup commands and will also confuse people who are # familiar with the python Distutils module. -samba_objs = "" -if os.environ.has_key("PYTHON_OBJS"): - samba_objs = os.environ.get("PYTHON_OBJS") +samba_objs = os.environ.get("PYTHON_OBJS", "") -samba_cflags = "" -if os.environ.has_key("PYTHON_CFLAGS"): - samba_cflags = os.environ.get("PYTHON_CFLAGS") +samba_cflags = os.environ.get("PYTHON_CFLAGS", "") -samba_srcdir = "" -if os.environ.has_key("SRCDIR"): - samba_srcdir = os.environ.get("SRCDIR") +samba_srcdir = os.environ.get("SRCDIR", "") # These variables are filled in by configure -samba_libs = "@LIBS@" +samba_libs = os.environ.get("LIBS", "") # Convert libs and objs from space separated strings to lists of strings # for distutils to digest. Split "-l" prefix off library list. |