From 710e055777a9f0c689f8de6b666e667248f222f7 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 17 Apr 2003 04:57:35 +0000
Subject: [PATCH] * Makefile.in (xclever-package, xlick-package): New rules.
 (install-package, install-package-ja, package, package-ja):
 Use them.

* aclocal.m4 (AC_PATH_INFO_DIR): Say a note for XEmacs package.
---
 ChangeLog   |    5 +++++
 Makefile.in |   14 ++++++++++----
 aclocal.m4  |    7 ++++---
 configure   |   14 ++++++++------
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c77a6a..f268f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +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.
+
+	* aclocal.m4 (AC_PATH_INFO_DIR): Say a note for XEmacs package.
+
 	* lisp/dgnushack.el: Remove useless function bindings for XEmacs.
 	(dgnushack-install-package-manifest): Create the pkginfo directory.
 
diff --git a/Makefile.in b/Makefile.in
index 9ad496c..e489ce6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,18 +58,18 @@ install-info-ja:
 	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja
 
 ## Rule for XEmacs package.
-install-package: xclever 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 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
 
-package: xlick xinfo compose-package
+package: xlick-package xinfo compose-package
 
-package-ja: xlick xinfo xinfo-ja compose-package
+package-ja: xlick-package xinfo xinfo-ja compose-package
 
 # Sub-rule for XEmacs package.
 install-package-lisp:
@@ -136,9 +136,15 @@ 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
+
 xlick:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
 
+xlick-package:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" all
+
 xinfo:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" all-info
 
diff --git a/aclocal.m4 b/aclocal.m4
index 9787c58..047cd6b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -154,7 +154,8 @@ AC_DEFUN(AC_PATH_INFO_DIR, [
   else
     info_dir=$infodir
   fi
-  AC_MSG_RESULT($info_dir)
+  AC_MSG_RESULT([$info_dir
+         (it will be ignored when \"make install-package[[-ja]]\" is done)])
   AC_SUBST(info_dir)
 ])
 
@@ -265,7 +266,7 @@ fi
    if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
 	AC_MSG_RESULT(not found)
    else
-	AC_MSG_RESULT("${URL}")
+	AC_MSG_RESULT(${URL})
    fi
 ])
 
@@ -348,7 +349,7 @@ if test -z "${USE_FONTS}" ; then
   USE_FONTS=no
 fi
 USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([[^,]]*\)$/ and\1/'`
-AC_MSG_RESULT("${USE_FONTS}")
+AC_MSG_RESULT(${USE_FONTS})
 if test "${USE_FONTS}" = yes ; then
   USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
 elif test "${USE_FONTS}" = no ; then
diff --git a/configure b/configure
index 0882f04..f9209ed 100755
--- a/configure
+++ b/configure
@@ -1742,8 +1742,10 @@ echo $ECHO_N "checking where the TeXinfo docs should go... $ECHO_C" >&6
   else
     info_dir=$infodir
   fi
-  echo "$as_me:$LINENO: result: $info_dir" >&5
-echo "${ECHO_T}$info_dir" >&6
+  echo "$as_me:$LINENO: result: $info_dir
+         (it will be ignored when \"make install-package[-ja]\" is done)" >&5
+echo "${ECHO_T}$info_dir
+         (it will be ignored when \"make install-package[-ja]\" is done)" >&6
 
 
 
@@ -1853,8 +1855,8 @@ fi;
 	echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
    else
-	echo "$as_me:$LINENO: result: \"${URL}\"" >&5
-echo "${ECHO_T}\"${URL}\"" >&6
+	echo "$as_me:$LINENO: result: ${URL}" >&5
+echo "${ECHO_T}${URL}" >&6
    fi
 
 
@@ -2108,8 +2110,8 @@ if test -z "${USE_FONTS}" ; then
   USE_FONTS=no
 fi
 USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([^,]*\)$/ and\1/'`
-echo "$as_me:$LINENO: result: \"${USE_FONTS}\"" >&5
-echo "${ECHO_T}\"${USE_FONTS}\"" >&6
+echo "$as_me:$LINENO: result: ${USE_FONTS}" >&5
+echo "${ECHO_T}${USE_FONTS}" >&6
 if test "${USE_FONTS}" = yes ; then
   USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
 elif test "${USE_FONTS}" = no ; then
-- 
1.7.10.4