X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0db7db3090df8d5afd5fda176511fea8656f1930..1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302:/lib-src/Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 13a7a05156..150d943b7e 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,7 +1,7 @@
 ### @configure_input@
 
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2014
-#   Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2016 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -21,10 +21,10 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
-# ==================== Things `configure' will edit ====================
+# ==================== Things 'configure' will edit ====================
 
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -58,6 +58,21 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_RC = $(am__v_RC_@AM_V@)
+am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@)
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -68,31 +83,31 @@ ns_appbindir=@ns_appbindir@
 # subdirectories of this directory.  The default values for many of
 # the variables below are expressed in terms of this one, so you may
 # not need to change them.  This is set with the --prefix option to
-# `../configure'.
+# '../configure'.
 prefix=@prefix@
 
-# Like `prefix', but used for architecture-specific files.  This is
-# set with the --exec-prefix option to `../configure'.
+# Like 'prefix', but used for architecture-specific files.  This is
+# set with the --exec-prefix option to '../configure'.
 exec_prefix=@exec_prefix@
 
 # Where to install Emacs and other binaries that people will want to
 # run directly (like etags).  This is set with the --bindir option
-# to `../configure'.
+# to '../configure'.
 bindir=@bindir@
 
 # 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
-# --libexecdir option to `../configure'.
+# --libexecdir option to '../configure'.
 libexecdir=@libexecdir@
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
 
 # Where to find the source code.  This is set by the configure
-# script's `--srcdir' option.  However, the value of ${srcdir} in
+# script's '--srcdir' option.  However, the value of ${srcdir} in
 # this makefile is not identical to what was specified with --srcdir,
-# since the variable here has `/lib-src' added at the end.
+# since the variable here has '/lib-src' added at the end.
 
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
@@ -112,11 +127,12 @@ abs_top_srcdir=@abs_top_srcdir@
 # This path usually includes the Emacs version and configuration name,
 # so that multiple configurations for multiple versions of Emacs may
 # be installed at once.  This can be set with the --archlibdir option
-# to `../configure'.
+# to '../configure'.
 archlibdir=@archlibdir@
 
 gamedir=@gamedir@
 gameuser=@gameuser@
+gamegroup=@gamegroup@
 
 # ==================== Utility Programs for the Build =================
 
@@ -223,8 +239,8 @@ $(EXE_FILES): ../lib/libgnu.a
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
 blessmail: $(srcdir)/../lisp/mail/blessmail.el
-	$(EMACS) $(EMACSOPT) -l $<
-	chmod +x $@
+	$(AM_V_GEN)$(EMACS) $(EMACSOPT) -l $<
+	$(AM_V_at)chmod +x $@
 
 ## This checks if we need to run blessmail.
 ## Do not charge ahead and do it!  Let the installer decide.
@@ -248,24 +264,41 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
 	@echo
 	@echo "Installing utilities run internally by Emacs."
-	umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
-	exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+	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" || exit; \
 	  done ; \
         fi
-	umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \
-	touch "$(DESTDIR)${gamedir}/snake-scores"; \
-	touch "$(DESTDIR)${gamedir}/tetris-scores"
-	-if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
-	  chown ${gameuser} "$(DESTDIR)${gamedir}"; \
+	umask 022 && ${MKDIR_P} "$(DESTDIR)${gamedir}" && \
+	touch "$(DESTDIR)${gamedir}/snake-scores" \
+	      "$(DESTDIR)${gamedir}/tetris-scores"
+ifneq ($(gameuser),)
+	if chown ${gameuser} \
+	     "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+	   chmod u+s,go-r \
+	     "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
+	then \
+	  chown ${gameuser} "$(DESTDIR)${gamedir}" && \
+	  chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"; \
+	fi
+else ifneq ($(gamegroup),)
+	if chgrp ${gamegroup} \
+	     "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
+	   chmod g+s,o-r \
+	     "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
+	then \
+	  chgrp ${gamegroup} "$(DESTDIR)${gamedir}" && \
 	  chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
 	fi
-	exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
+endif
+	exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
 	if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
 	  for file in ${SCRIPTS}; do \
-	    $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \
+	    $(INSTALL_SCRIPT) ${srcdir}/$$file \
+	      "$(DESTDIR)${archlibdir}/$$file" || exit; \
 	  done ; \
 	fi
 
@@ -275,45 +308,52 @@ $(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} || exit; \
 	done
 
 uninstall:
 	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} ${SCRIPTS}) \
+	  cd "$(DESTDIR)${archlibdir}" && \
+	  rm -f ${UTILITIES} ${SCRIPTS}; \
 	fi
 
 mostlyclean:
-	-rm -f core *.o *.res
+	rm -f core *.o *.res
 
 clean: mostlyclean
-	-rm -f ${EXE_FILES}
+	rm -f ${EXE_FILES}
 
 distclean: clean
-	-rm -f TAGS
-	-rm -f Makefile blessmail
+	rm -f TAGS Makefile blessmail
 
 bootstrap-clean maintainer-clean: distclean
-	true
 
 extraclean: maintainer-clean
-	-rm -f *~ \#*
+	rm -f *~ \#*
 
 ## Test the contents of the directory.
 check:
 	@echo "We don't have any tests for the lib-src/ directory yet."
 
+tagsfiles = $(wildcard ${srcdir}/*.[ch])
+
+.PHONY: tags
 tags: TAGS
-TAGS: etags${EXEEXT}
-	etags *.[ch]
+TAGS: etags${EXEEXT} ${tagsfiles}
+	./etags ${tagsfiles}
 
 ../lib/libgnu.a: $(config_h)
-	$(MAKE) -C ../lib libgnu.a
+	$(MAKE) -C ../lib all
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
 	$(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $<
@@ -381,6 +421,6 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
 	  $< $(NTLIB) $(LOADLIBES) -o $@
 
 emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
-	$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
+	$(AM_V_RC)$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
 
 ## Makefile ends here.