Include cm.h after dispextern.h to avoid name conflicts

[bpt/emacs.git] / build-ins.in

diff --git a/build-ins.in b/build-ins.in
index 0769f52..acca276 100755 (executable)
--- a/build-ins.in
+++ b/build-ins.in
@@ -82,8 +82,7 @@ dumplisppath=`echo ${dumplisppath} | ${removenullpaths}` ;    \
 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${dumplisppath}'";' \
 -e 's;\(#.*PATH_EXEC\).*$$;\1 "${libdir}";'                    \
 -e 's;\(#.*PATH_DATA\).*$$;\1 "${datadir}";'                   \
--e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";'                  \
--e 's;\(#.*PATH_SUPERLOCK\).*$$;\1 "${lockdir}/!!!SuperLock!!!";'
+-e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";'
 
 (cd lib-src; make) || exit 1
 (cd src; make) || exit 1
@@ -97,14 +96,14 @@ for dir in ${copydests}; do
   case "${dir}" in
     ${emacsdir}/* )
       if [ ! -d ${emacsdir} ]; then
-       -mkdir ${emacsdir}
-       -chmod 777 ${emacsdir}
+       mkdir ${emacsdir}
+       chmod 777 ${emacsdir}
       fi
     ;;
     ${statedir}/* )
       if [ ! -d ${statedir} ]; then
-       -mkdir ${statedir}
-       -chmod 777 ${statedir}
+       mkdir ${statedir}
+       chmod 777 ${statedir}
       fi
     ;;
   esac
@@ -132,6 +131,6 @@ for dir in ${copydir} ; do
 done
 
 cp ${libdir}/[ce]tags ${bindir}
-mv src/xemacs ${BINDIR}/emacs
+mv src/emacs ${BINDIR}/emacs
 rm src/temacs
 chmod 777 ${bindir}/[ce]tags ${bindir}/emacs