[emacs-snapshot-debian commit] @ emacs-snapshot-debian--main--0

[Jérôme Marant]

jerome@marant.org (Jérôme Marant) writes:

Damit!

Here is the changelog:

* looking for jerome@debian.org--2005/emacs-snapshot-debian--main--0--patch-6 to compare with
* comparing to jerome@debian.org--2005/emacs-snapshot-debian--main--0--patch-6
..

* modified files

--- orig/changelog
+++ mod/changelog
@@ -1,3 +1,16 @@
+emacs-snapshot (20050519215621-1) unstable; urgency=low
+
+  * New snapshot release.
+  
+  * Do not force epaths re-generation after calls to configure any more
+    since configure now provides a '--enable-locallisppath'
+    - debian/rules:
+      + Add --enable-locallisppath option to confflags
+      + Remove epaths_force_cmd function
+      + Remove calls to epaths_force_cmd
+
+ -- Jerome Marant <jerome@debian.org>  Thu, 19 May 2005 22:07:33 +0200
+
 emacs-snapshot (20050425220908-2) unstable; urgency=low
 
   * Merge fixes from Davide Salvetti <salve@debian.org>


--- orig/rules
+++ mod/rules
@@ -424,10 +424,6 @@
 	${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 endef
 
-define epaths_force_cmd
-	${build_cmd} locallisppath=${local_lpath} epaths-force
-endef
-
 emacs_inst = (${MAKE} install \
 		INSTALL_STRIP="-s" \
 		prefix=${1}/usr \
@@ -448,6 +444,7 @@
 confflags += --mandir=/usr/share/man
 confflags += --with-pop=yes
 confflags += --with-gif
+confflags += --enable-locallisppath=${local_lpath}
 
 # Emacs confflags
 emacs_confflags := ${confflags}
@@ -474,13 +471,11 @@
 	# Emacs must be boostraped at least once in order to
 	# generate .elc files
 	CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
-	${epaths_force_cmd}
 	${build_cmd} bootstrap
 	${build_cmd} distclean
 
 	# Build emacs
 	CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
-	${epaths_force_cmd}
 	${build_cmd}
 	# save binary from deletion
 	mv src/emacs src/x-emacs
@@ -488,7 +483,6 @@
 
 	# Build emacs-gtk
 	CFLAGS="${CFLAGS}" ./configure ${emacs_gtk_confflags}
-	${epaths_force_cmd}
 	${build_cmd}
 	# save binary from deletion
 	mv src/emacs src/gtk-emacs
@@ -496,7 +490,6 @@
 
 	# Build emacs-nox
 	CFLAGS="${CFLAGS}" ./configure ${emacs_nox_confflags}
-	${epaths_force_cmd}
 	${build_cmd}
 	# save binary from deletion
 	mv src/emacs src/nox-emacs





-- 
Jérôme Marant