diff options
| author | Bruce Momjian <bruce@momjian.us> | 2012-12-04 12:23:36 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2012-12-04 12:23:36 -0500 |
| commit | 2e375ab4b5b1b4308e4c16fc755e45c1ccf1988e (patch) | |
| tree | bb943dfd3d581a15a802c6d96081625bdcadeabb | |
| parent | f928ffd65e1f48f6d5022e0cda701abd1abd9b0e (diff) | |
Fix Makefile breakage caused by a committed merge conflict.
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index ced2fc4654f..3adf36d8bed 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -58,11 +58,7 @@ include $(top_srcdir)/src/Makefile.shlib # necessarily use the same object files as the backend uses. Instead, # symlink the source files in here and build our own object file. -<<<<<<< HEAD -path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/% -======= -path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/% ->>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system. +path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c isinf.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h |