2000-01-14 14:05:09 +00:00
|
|
|
--- src/Makefile.in.orig Fri Jan 14 23:02:09 2000
|
|
|
|
|
+++ src/Makefile.in Fri Jan 14 23:02:43 2000
|
1998-12-13 14:27:06 +00:00
|
|
|
@@ -126,6 +126,10 @@
|
|
|
|
|
#define LIBS_MACHINE
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+#ifndef LIBS_XPG
|
|
|
|
|
+#define LIBS_XPG
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#ifndef LIB_MATH
|
|
|
|
|
# ifdef LISP_FLOAT_TYPE
|
|
|
|
|
# define LIB_MATH -lm
|
|
|
|
|
@@ -418,7 +422,11 @@
|
|
|
|
|
libexecdir=${exec_prefix}/libexec
|
|
|
|
|
archlibdir=${libexecdir}/emacs/${version}/${configuration}
|
|
|
|
|
#ifdef __FreeBSD__
|
|
|
|
|
+#ifdef __ELF__
|
|
|
|
|
+#define LINKER $(CC) -nostdlib -Wl,-export-dynamic -Wl,-R${archlibdir}
|
|
|
|
|
+#else /* not __ELF__ */
|
|
|
|
|
#define LINKER $(CC) -nostdlib -Wl,-R${archlibdir}
|
|
|
|
|
+#endif /* __ELF__ */
|
|
|
|
|
#else
|
|
|
|
|
#define LINKER $(CC) -nostdlib -rdynamic -Wl,-rpath,${archlibdir}
|
|
|
|
|
#endif
|
2000-01-14 14:05:09 +00:00
|
|
|
@@ -569,7 +577,7 @@
|
|
|
|
|
#define LIBS_TERMCAP
|
|
|
|
|
termcapobj = termcap.o tparam.o
|
|
|
|
|
#else /* LIBS_TERMCAP */
|
|
|
|
|
-termcapobj = tparam.o
|
|
|
|
|
+termcapobj = terminfo.o
|
|
|
|
|
#endif /* LIBS_TERMCAP */
|
|
|
|
|
#endif /* ! defined (TERMINFO) */
|
|
|
|
|
|
1998-12-13 14:27:06 +00:00
|
|
|
@@ -814,7 +822,7 @@
|
|
|
|
|
duplicated symbols. If the standard libraries were compiled
|
|
|
|
|
with GCC, we might need gnulib again after them. */
|
|
|
|
|
LIBES = $(LOADLIBES) $(LDLIBS) $(LIBX) $(LIBDL) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
|
|
|
|
|
- LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
|
|
|
|
|
+ LIBS_XPG LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
|
|
|
|
|
|
|
|
|
|
/* Enable recompilation of certain other files depending on system type. */
|
|
|
|
|
|
