X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/641d87d868e0f46f4bfca3d8d7bede88032045e1..3d2b9c202d215ec220a7b2d62b28768ec7f40e44:/src/makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index cd5731f969..a875d3ee7b 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -16,7 +16,10 @@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 .cxx.o :
 	$(CC) -c $(CPPFLAGS) -o $@ $<
 
-VPATH = :$(top_srcdir)/$(program_dir)
+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf
 
 # Set defaults from configure
 include $(top_builddir)/src/make.env
@@ -24,7 +27,7 @@ include $(top_builddir)/src/make.env
 all:    $(BIN_PROGRAM) install_dirs install_data
 
 $(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \
@@ -34,7 +37,7 @@ install_dirs:
 install_data:
 	@list='$(DATAFILES)'; for p in $$list; do \
 	  if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
-	     cp -f $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+	     cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
 	  fi; \
 	done