head 1.2; access; symbols; locks; strict; comment @# @; 1.2 date 2002.12.30.20.42.20; author swiergot; state Exp; branches; next 1.1; 1.1 date 2002.12.30.20.24.30; author swiergot; state Exp; branches; next ; desc @@ 1.2 log @- Updated the destdir patch to create LIBEXECDIR directory. @ text @--- Makefile.in.orig 2002-12-30 21:40:00.000000000 +0100 +++ Makefile.in 2002-12-30 21:41:25.000000000 +0100 @@@@ -64,6 +64,8 @@@@ PYTHON_BIN=@@PYTHON_BIN@@ PY_STD_LIB=@@PY_STD_LIB@@ +DESTDIR= + all: @@ALL@@ dso: @@DSO@@ @@@@ -92,7 +94,8 @@@@ @@echo @@echo "Performing DSO installation." @@echo - $(INSTALL) src/mod_python.so $(LIBEXECDIR) + $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR) + $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR) @@$(MAKE) install_py_lib @@echo @@echo "Now don't forget to edit your main config and add" @@@@ -102,13 +105,13 @@@@ @@echo install_py_lib: - $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python + $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python @@for f in `ls lib/python/mod_python/*.py`; \ do \ - $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \ + $(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \ done - ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python - ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python + ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python + ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python clean: cd src && $(MAKE) clean @ 1.1 log @- Added a destdir patch to allow use other parent install directory. - Fixed info and build_info. - Cosmetics. @ text @d1 2 a2 2 --- Makefile.in.orig 2002-12-30 21:14:45.000000000 +0100 +++ Makefile.in 2002-12-30 21:20:07.000000000 +0100 d12 1 a12 1 @@@@ -92,7 +94,7 @@@@ d17 1 d22 1 a22 1 @@@@ -102,13 +104,13 @@@@ @ .