Commits

aichnerad  committed f56266c

r1-74 is released.

  • Participants
  • Parent commits b949461
  • Tags r1-74

Comments (0)

Files changed (3)

+2001-04-08  Adrian Aichner  <adrian@xemacs.org>
+
+	* Makefile (VERSION): r1-74 is released.
+	* build.el (build-configure): Fix configure argument processing.
+	* build.el (build-configure-generate): Find "configure.usage"
+	according to `build-from-what', not (config-value-hash-table) of
+	running XEmacs.
+	* build.el (build-make-generate): Ditto for "Makefile.in".
+
 2001-04-07  Adrian Aichner  <adrian@xemacs.org>
 
 	* Makefile (VERSION): r1-73 is released.
 # For the time being, remove MULE_ELCS from the all dependencies if
 # building without Mule.
 
-VERSION = 1.73
+VERSION = 1.74
 AUTHOR_VERSION = $Name$
 MAINTAINER = Adrian Aichner <adrian@xemacs.org>
 PACKAGE = build
                                  (string= "no" (rest e)))
                                 (format " '-with-%s'" (match-string 1 (first e))))
                                (t
-                                (concat " '%s=%s'" (first e) (rest e))))))
+                                (format " '%s=%s'" (first e) (rest e))))))
                   (delete-duplicates
                    build-configure-options :from-end t
                    :test (lambda (a b)
     (setq file
           (expand-file-name
            "configure.usage"
-           (gethash 'blddir (config-value-hash-table)))))
+           (cond
+            ((string-equal build-from-what "Tarballs")
+             (expand-file-name
+              build-tarball-prefix
+              build-tarball-dest))
+            ((string-equal build-from-what "CVS")
+             (expand-file-name
+              build-cvs-checkout-dir
+              build-cvs-checkout-parent-dir))))))
   (let
       (category categories option value detected doc build-configure-alist
                 (buffer "build-configure.el"))
     (setq file
           (expand-file-name
            "Makefile.in"
-           (gethash 'blddir (config-value-hash-table)))))
+           (cond
+            ((string-equal build-from-what "Tarballs")
+             (expand-file-name
+              build-tarball-prefix
+              build-tarball-dest))
+            ((string-equal build-from-what "CVS")
+             (expand-file-name
+              build-cvs-checkout-dir
+              build-cvs-checkout-parent-dir))))))
   (let
       (category categories option value detected doc
                 (buffer "build-make.el"))