1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile breakage caused by a committed merge conflict.

Browse Source
This commit is contained in:
Bruce Momjian 2012-12-04 12:23:36 -05:00
parent f928ffd65e
commit 2e375ab4b5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -58,11 +58,7 @@ include $(top_srcdir)/src/Makefile.shlib
# necessarily use the same object files as the backend uses. Instead, # necessarily use the same object files as the backend uses. Instead,
# symlink the source files in here and build our own object file. # symlink the source files in here and build our own object file.
<<<<<<< HEAD path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c isinf.c: % : $(top_srcdir)/src/port/%
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.
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h