Install directory is changed.

PR:		ports/8224
Submitted by:	Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

3 files changed, 22 insertions, 17 deletions

diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 1ed8241a731a..0f840eb05cfd 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for: YaTeX
 # Version required:	1.65.6
-# Date created:		18 Feb. 1998
+# Date created:		Oct 9 1998
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/14 00:16:07 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/21 07:09:58 asami Exp $
 #
 
 DISTNAME=	yatex9805062331
@@ -37,7 +37,8 @@ ADDSITESTART=	(setq load-path (append (list \\n\
 		\\t\\"${ELISPDIR}/yatex\\"\\n\
 		\\t) load-path))\\n
 .if defined(MULE)
-EMACSDIR=	${PREFIX}/lib/mule
+EMACSDIR=	${PREFIX}/share/mule
+SITESTARTDIR=	${EMACSDIR}/19.34/site-lisp
 .endif
 .if defined(XEMACS-MULE)
 EMACS=		xemacs
@@ -45,6 +46,7 @@ EMACSDIR=	${PREFIX}/lib/xemacs
 #
 INFODIR=	${EMACSDIR}/info
 ADDSITESTART=
+SITESTARTDIR=
 .endif
 .if defined(MULE) || defined(XEMACS-MULE)
 NEW=		yatex.new
@@ -96,6 +98,7 @@ do-build:
 		 -e 's,%INFONODES%,${INFONODES},g' \
 		 -e 's,%INFONODEEXPS%,${INFONODEEXPS},g' \
 		 -e 's,%DIRSECTION%,${DIRSECTION},g' \
+		 -e 's,%SITESTARTDIR%,${SITESTARTDIR},g' \
 		 -e 's,%ADDSITESTART%,${ADDSITESTART},g' \
 		< ${FILESDIR}/$${file}.tmpl > ${FILESDIR}/$${file}; \
 	done
diff --git a/print/yatex/files/DEINSTALL.tmpl b/print/yatex/files/DEINSTALL.tmpl
index f81af13e6413..30807e5099a1 100644
--- a/print/yatex/files/DEINSTALL.tmpl
+++ b/print/yatex/files/DEINSTALL.tmpl
@@ -10,6 +10,7 @@ SED=${SED:-%SED%}
 
 infodir=${INFODIR:-%INFODIR%}
 infofiles=${INFOFILES:-%INFOFILES%}
+sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%}
 elispdir=${ELISPDIR:-%ELISPDIR%}
 
 OptionStart=";;; configuration options for ${pkgname}"
@@ -20,12 +21,12 @@ if [ "X$2" = X"DEINSTALL" ]; then
 	for file in `echo  ${infofiles} | ${SED} "s,:, ,g"`; do
 		install-info --delete ${infodir}/${file} ${infodir}/dir
 	done
-	if  [ "`grep \"^${OptionStart}\"  ${elispdir}/site-start.el`" ]; then 
-		${ECHO} "Deleting entry for \"${pkgname}\" from ${elispdir}/site-start.el"
+	if  [ "`grep \"^${OptionStart}\"  ${sitestartdir}/site-start.el`" ]; then 
+		${ECHO} "Deleting entry for \"${pkgname}\" from ${sitestartdir}/site-start.el"
 		${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
-		    ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
-		${CP} ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
-		${RM} ${elispdir}/site-start.el.bak
+		    ${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak
+		${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el
+		${RM} ${sitestartdir}/site-start.el.bak
 	fi
 else
 	exit 0
diff --git a/print/yatex/files/INSTALL.tmpl b/print/yatex/files/INSTALL.tmpl
index 7ecae01e18fc..f3dea6f828d0 100644
--- a/print/yatex/files/INSTALL.tmpl
+++ b/print/yatex/files/INSTALL.tmpl
@@ -15,14 +15,15 @@ infofiles=${INFOFILES:-%INFOFILES%}
 infonodes=${INFONODES:-%INFONODES%}
 infonodeexps=${INFONODEEXPS:-%INFONODEEXPS%}
 elispdir=${ELISPDIR:-%ELISPDIR%}
+sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%}
 dirsection=${DIRSECTION:-%DIRSECTION%}
 
 OptionStart=";;; configuration options for ${pkgname}"
 OptionEnd=";;; End of configuration options for ${pkgname}"
 
 if [ "X$2" = X"POST-INSTALL" ]; then
-	if [ ! -f ${elispdir}/site-start.el ]; then 
-		 ${TOUCH} ${elispdir}/site-start.el
+	if [ ! -f ${sitestartdir}/site-start.el ]; then 
+		 ${TOUCH} ${sitestartdir}/site-start.el
 	fi
 	count=1
 	# For example, the result of `cut ttt -d : -f 2` is ttt. Why?
@@ -49,16 +50,16 @@ if [ "X$2" = X"POST-INSTALL" ]; then
 		install-info ${infodir}/${file} ${infodir}/dir
 	done
 	if [ X'%ADDSITESTART%' != X ]; then
-	if  [ "`${GREP} \"^${OptionStart}\"  ${elispdir}/site-start.el`" ]; then 
+	if  [ "`${GREP} \"^${OptionStart}\"  ${sitestartdir}/site-start.el`" ]; then 
 		${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
-		  ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
-		${CP} ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
+		  ${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak
+		${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el
 	fi
-	${ECHO} "Adding entry for \"${pkgname}\" to ${elispdir}/site-start.el"
-	${ECHO} "${OptionStart}" >> ${elispdir}/site-start.el
+	${ECHO} "Adding entry for \"${pkgname}\" to ${sitestartdir}/site-start.el"
+	${ECHO} "${OptionStart}" >> ${sitestartdir}/site-start.el
 	/usr/bin/printf "%ADDSITESTART%" | \
-	    ${SED} "s/^ //" >> ${elispdir}/site-start.el
-	${ECHO} "${OptionEnd}" >> ${elispdir}/site-start.el
+	    ${SED} "s/^ //" >> ${sitestartdir}/site-start.el
+	${ECHO} "${OptionEnd}" >> ${sitestartdir}/site-start.el
 	fi
 	exit 0
 else