Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se

[bpt/emacs.git] / nt / Makefile.in

diff --git a/nt/Makefile.in b/nt/Makefile.in
index 7085a5c..f498928 100644 (file)
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -1,6 +1,6 @@
-# nt/Makefile for GNU Emacs.
+### @configure_input@
 
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -56,6 +56,15 @@ exec_prefix=@exec_prefix@
 # to `../configure'.
 bindir=@bindir@
 
+# The root of the directory tree for read-only architecture-independent
+# data files.  ${datadir}, ${infodir} and ${mandir} are based on this.
+datarootdir=@datarootdir@
+
+# Where to install architecture-independent data files.  ${lispdir}
+# and ${etcdir} are subdirectories of this.  This is set with the
+# --datadir option to `../configure'.
+datadir=@datadir@
+
 # Where to install and expect executable files to be run by Emacs
 # rather than directly by users, and other architecture-dependent
 # data.  ${archlibdir} is usually below this.  This is set with the
@@ -76,6 +85,8 @@ VPATH=@srcdir@
 
 # The top-level source directory, also set by configure.
 top_srcdir=@top_srcdir@
+# MinGW CPPFLAGS may use this.
+abs_top_srcdir=@abs_top_srcdir@
 
 # ==================== Emacs-specific directories ====================
 
@@ -93,6 +104,7 @@ archlibdir=@archlibdir@
 
 # ../configure figures out the correct values for these.
 INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # By default, we uphold the dignity of our programs.
@@ -141,10 +153,11 @@ all: ${EXE_FILES}
 $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
-       umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-       if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
+       umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+       if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
          for file in ${UTILITIES}; do \
-           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
+           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \
          done ; \
         fi
 
@@ -154,21 +167,24 @@ $(DESTDIR)${archlibdir}: all
 install: $(DESTDIR)${archlibdir}
        @echo
        @echo "Installing utilities for users to run."
-       umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
+       umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
        for file in ${INSTALLABLES} ; do \
-         $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
+         $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
        done
+       ${MKDIR_P} "$(DESTDIR)${datadir}/emacs/$(version)"
+       $(INSTALL_DATA) ${srcdir}/README.W32 "$(DESTDIR)${datadir}/emacs/$(version)"
 
 uninstall:
+       rm -f "$(DESTDIR)${datadir}/emacs/$(version)/README.W32"
        for file in ${INSTALLABLES}; do \
-         rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
+         rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
        done
-       if [ -d $(DESTDIR)${archlibdir} ]; then \
-         (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES}) \
+       if [ -d "$(DESTDIR)${archlibdir}" ]; then \
+         (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES}) \
        fi
 
 mostlyclean:
-       -rm -f core *.o
+       -rm -f core *.o *.res
 
 clean: mostlyclean
        -rm -f ${EXE_FILES}
@@ -195,7 +211,7 @@ TAGS: ${EXE_FILES:${EXEEXT}=.c}
 addsection${EXEEXT}: ${srcdir}/addsection.c
        $(CC) ${ALL_CFLAGS} ${srcdir}/addsection.c -o addsection${EXEEXT}
 
-addpm${EXEEXT}: ${srcdir}/addpm.c ${srcdir}/../src/epaths.h
+addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h
        $(CC) ${ALL_CFLAGS} ${srcdir}/addpm.c $(LIBS_ADDPM) -o addpm${EXEEXT}
 
 ddeclient${EXEEXT}: ${srcdir}/ddeclient.c
@@ -205,8 +221,8 @@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
        $(CC) ${ALL_CFLAGS} ${srcdir}/cmdproxy.c -o cmdproxy${EXEEXT}
 
 runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
-       $(CC) ${ALL_CFLAGS} ${srcdir}/runemacs.c $(EMACSRES) \
+       $(CC) ${ALL_CFLAGS} ${srcdir}/runemacs.c $(EMACSRES) -mwindows \
          -o runemacs${EXEEXT}
 
 emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST)
-       ${WINDRES} -O coff -o emacs.res emacs.rc
+       ${WINDRES} -I ${srcdir} -O coff -o emacs.res ${srcdir}/emacs.rc