From bcf2f9dc1a3ab7316d31e094d9ed815aaf8f7942 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 17 Apr 2003 06:18:37 +0000
Subject: [PATCH] * Makefile.in (install-package-manifest,
 remove-extra-files-in-package, compose-package): Specify
 the lisp directory for XEmacs package.

---
 ChangeLog   |    5 ++++-
 Makefile.in |   23 ++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f268f01..6eecf2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2003-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* Makefile.in (xclever-package, xlick-package): New rules.
-	(install-package, install-package-ja, package, package-ja): Use them.
+	(install-package, install-package-ja, package, package-ja): Use
+	them.
+	(install-package-manifest, remove-extra-files-in-package,
+	compose-package): Specify the lisp directory for XEmacs package.
 
 	* aclocal.m4 (AC_PATH_INFO_DIR): Say a note for XEmacs package.
 
diff --git a/Makefile.in b/Makefile.in
index e489ce6..69c491b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,11 +58,17 @@ install-info-ja:
 	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja
 
 ## Rule for XEmacs package.
-install-package: xclever-package compose-package remove-extra-files-in-package \
+install-package: \
+	xclever-package \
+	compose-package \
+	remove-extra-files-in-package \
 	install-package-lisp \
 	install-package-info install-package-manifest
 
-install-package-ja: xclever-package compose-package remove-extra-files-in-package \
+install-package-ja: \
+	xclever-package \
+	compose-package \
+	remove-extra-files-in-package \
 	install-package-lisp \
 	install-package-info install-package-info-ja \
 	install-package-manifest
@@ -114,8 +120,10 @@ install-package-manifest:
 	  package_dir="$(PACKAGEDIR)"; \
 	fi; \
 	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"lispdir=$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		"install-package-manifest"; \
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		install-package-manifest
 
 remove-extra-files-in-package:
@@ -125,25 +133,30 @@ remove-extra-files-in-package:
 	  package_dir="$(PACKAGEDIR)"; \
 	fi; \
 	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"lispdir=$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		"remove-extra-files-in-package"; \
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		remove-extra-files-in-package
 
 compose-package:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-package
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" \
+	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" compose-package
 ##
 
 xclever:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" clever
 
 xclever-package:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" clever
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" \
+	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" clever
 
 xlick:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
 
 xlick-package:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" all
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" \
+	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" all
 
 xinfo:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" all-info
-- 
1.7.10.4