Log message for revision 38017:
  Make it so that version.txt is written on every make install/inplace/instance
  and not just when the file is missing. This is a forward port from 
Zope-2_7-branch.
  

Changed:
  U   Zope/trunk/inst/Makefile.in

-=-
Modified: Zope/trunk/inst/Makefile.in
===================================================================
--- Zope/trunk/inst/Makefile.in 2005-08-20 16:32:24 UTC (rev 38016)
+++ Zope/trunk/inst/Makefile.in 2005-08-20 16:32:39 UTC (rev 38017)
@@ -51,12 +51,8 @@
 unbuild:
        ${RMRF} ${BUILD_BASE}
 
-${BASE_DIR}/lib/python/version.txt:
-       printf "Zope ${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}" >\
-          "${BASE_DIR}/lib/python/version.txt"
-
 # install:     Install a software home.
-install: build ${BASE_DIR}/lib/python/version.txt
+install: build version_txt
        ${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
           --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
        [ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
@@ -109,13 +105,18 @@
        ${FIND} "${BASE_DIR}" \
          -name '*.py[co]' -o -name '*.so' -o -name '*.o' | ${XARGS} ${RM}
 
+# version_txt: create a version file in lib/python/version.txt
+version_txt:
+       printf "Zope ${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}" >\
+          "${BASE_DIR}/lib/python/version.txt"
+
 # sdist:       Create a source distribution file (implies clobber).
 #
 sdist: clobber sdist_tgz
 
 # sdist_tgz:   Create a tgz archive file as a source distribution.
 #
-sdist_tgz: ${BASE_DIR}/lib/python/version.txt
+sdist_tgz: version_txt
        ${MKDIR} ${TMPDIR}
        ${CD} ${TMPDIR} && ${LN} ${BASE_DIR} ${PACKAGE_NAME} && \
           ${TAR} czfh ${BASE_DIR}/${PACKAGE_NAME}.tgz \
@@ -124,7 +125,7 @@
            --exclude=makefile \
            --exclude=build-base \
            --exclude=*~ \
-           --exclude=.#*  ${PACKAGE_NAME} 
+           --exclude=.#* ${PACKAGE_NAME} 
        ${RMRF} ${TMPDIR}/${PACKAGE_NAME}
 
 # clobber:     Make the source tree 'pristine' again.

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to