* squid-2.3.STABLE1.obj_dir.patch *

Sat Jan 22 01:09:19 CET 2000
Modified Files in squid/icons
	Makefile.in 
Modified Files in squid/auth_modules/SMB
	Makefile.in 

Added support to icons and auth_modules/SMB for building in a separate
object directory.

-----------------------------------------------------------------

Index: squid/auth_modules/SMB/Makefile.in
diff -u squid/auth_modules/SMB/Makefile.in:1.1.1.3 squid/auth_modules/SMB/Makefile.in:1.1.1.3.2.1
--- squid/auth_modules/SMB/Makefile.in:1.1.1.3	Sat Jan 15 00:50:51 2000
+++ squid/auth_modules/SMB/Makefile.in	Sat Jan 22 01:09:16 2000
@@ -58,7 +58,8 @@
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= 
 
-LIBPROGS        = $(SMB_AUTH_EXE) $(SMB_AUTH_HELPER)
+LIBPROGS        = $(SMB_AUTH_EXE)
+LIBSCRIPTS	= $(SMB_AUTH_HELPER)
 OBJS	 	= smb_auth.o
 
 all:    $(SMB_AUTH_EXE)
@@ -86,6 +87,18 @@
 		fi; \
 		echo $(INSTALL_BIN) $$f $(libexecdir); \
 		$(INSTALL_BIN) $$f $(libexecdir); \
+		if test -f $(libexecdir)/-$$f; then \
+			echo $(RM) -f $(libexecdir)/-$$f; \
+			$(RM) -f $(libexecdir)/-$$f; \
+		fi; \
+	done
+	@for f in $(LIBSCRIPTS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+		fi; \
+		echo $(INSTALL_BIN) $$f $(libexecdir); \
+		$(INSTALL_BIN) $(srcdir)/$$f $(libexecdir); \
 		if test -f $(libexecdir)/-$$f; then \
 			echo $(RM) -f $(libexecdir)/-$$f; \
 			$(RM) -f $(libexecdir)/-$$f; \
Index: squid/icons/Makefile.in
diff -u squid/icons/Makefile.in:1.1.1.12 squid/icons/Makefile.in:1.1.1.12.8.1
--- squid/icons/Makefile.in:1.1.1.12	Sat Oct 30 13:24:36 1999
+++ squid/icons/Makefile.in	Sat Jan 22 01:09:19 2000
@@ -56,7 +56,7 @@
 			:; \
 		else \
 			echo "$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR)"; \
-			$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR); \
+			$(INSTALL_FILE) $(srcdir)/$$f $(DEFAULT_ICON_DIR); \
 		fi; \
 	done