From: hno <>
Date: Fri, 20 Apr 2001 15:58:29 +0000 (+0000)
Subject: Minor cleanup to put all auth helpers in libexec
X-Git-Tag: SQUID_3_0_PRE1~1530
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08ab71fe5dff8a8e9fbec68a80798b81e0f650c8;p=thirdparty%2Fsquid.git

Minor cleanup to put all auth helpers in libexec
---

diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in
index dbb4a09d9c..e5eedd346a 100644
--- a/helpers/basic_auth/NCSA/Makefile.in
+++ b/helpers/basic_auth/NCSA/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:27 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:29 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -51,10 +51,10 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS           = $(NCSA_AUTH_EXE)
-OBJS	 	= ncsa_auth.o
+LIBPROGS	= $(NCSA_AUTH_EXE)
+OBJS		= ncsa_auth.o
 
-all:    $(NCSA_AUTH_EXE)
+all:    $(LIBPROGS)
 
 $(OBJS): $(top_srcdir)/include/version.h
 
@@ -66,29 +66,29 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
 # to the install target.
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:	clean
 	-rm -f Makefile
diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in
index dd2cc8da56..76b11eb750 100644
--- a/helpers/basic_auth/YP/Makefile.in
+++ b/helpers/basic_auth/YP/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:28 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:30 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -51,10 +51,10 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS           = $(YP_AUTH_EXE)
+LIBPROGS           = $(YP_AUTH_EXE)
 OBJS	 	= yp_auth.o nis_support.o
 
-all:    $(YP_AUTH_EXE)
+all:    $(LIBPROGS)
 
 $(OBJS): $(top_srcdir)/include/version.h
 
@@ -66,29 +66,29 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
 # to the install target.
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:	clean
 	-rm -f Makefile
diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in
index 6473cc49a2..2b7dd848ed 100644
--- a/helpers/basic_auth/getpwnam/Makefile.in
+++ b/helpers/basic_auth/getpwnam/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:29 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:30 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -10,7 +10,7 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 exec_suffix	= @exec_suffix@
 top_srcdir	= @top_srcdir@
-bindir		= @bindir@
+libexecdir	= @libexecdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
@@ -36,10 +36,10 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS		= $(GETPWNAM_AUTH_EXE)
+LIBPROGS	= $(GETPWNAM_AUTH_EXE)
 OBJS		= getpwnam_auth.o
 
-all:    $(GETPWNAM_AUTH_EXE)
+all:    $(LIBPROGS)
 
 $(OBJS): $(top_srcdir)/include/version.h
 
@@ -51,27 +51,27 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:     clean
 	-rm -f Makefile
diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in
index 66b83d6aa7..53150ad2f0 100644
--- a/helpers/digest_auth/password/Makefile.in
+++ b/helpers/digest_auth/password/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/04/14 00:03:25 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:31 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -51,10 +51,10 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB)
 
-PROGS           = $(DIGEST_PW_AUTH_EXE)
+LIBPROGS	= $(DIGEST_PW_AUTH_EXE)
 OBJS	 	= digest_pw_auth.o
 
-all:    $(DIGEST_PW_AUTH_EXE)
+all:    $(LIBPROGS)
 
 $(OBJS): $(top_srcdir)/include/version.h
 
@@ -66,29 +66,29 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir $(libexecdir); \
 	fi
 
 # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
 # to the install target.
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:	clean
 	-rm -f Makefile
diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in
index e83646ab11..b5f88088cc 100644
--- a/helpers/ntlm_auth/SMB/Makefile.in
+++ b/helpers/ntlm_auth/SMB/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:29 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:31 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -10,7 +10,7 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 exec_suffix	= @exec_suffix@
 top_srcdir	= @top_srcdir@
-bindir		= @bindir@
+libexecdir		= @libexecdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
@@ -36,7 +36,7 @@ INCLUDE		= -I. -I../../../../../include -I$(srcdir)/smbval -I$(top_srcdir)/inclu
 CFLAGS		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lntlmauth -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS		= $(NTLM_AUTH_EXE)
+LIBPROGS	= $(NTLM_AUTH_EXE)
 OBJS		= ntlm_auth.o libntlmssp.o
 
 all:	$(NTLM_AUTH_EXE)  smbval/smbvalid.a
@@ -56,27 +56,27 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean:
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 	cd smbval; make clean
 
 distclean:     clean
diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in
index e3e2c7c455..a8583a1b4f 100644
--- a/helpers/ntlm_auth/fakeauth/Makefile.in
+++ b/helpers/ntlm_auth/fakeauth/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:30 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:31 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -10,7 +10,7 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 exec_suffix	= @exec_suffix@
 top_srcdir	= @top_srcdir@
-bindir		= @bindir@
+libexecdir		= @libexecdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
@@ -36,7 +36,7 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS		= $(FAKEAUTH_AUTH_EXE)
+LIBPROGS	= $(FAKEAUTH_AUTH_EXE)
 OBJS		= fakeauth_auth.o
 
 all:    $(FAKEAUTH_AUTH_EXE)
@@ -51,27 +51,27 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:     clean
 	-rm -f Makefile
diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in
index 57350823d3..66aa2590b8 100644
--- a/helpers/ntlm_auth/no_check/Makefile.in
+++ b/helpers/ntlm_auth/no_check/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2001/01/16 21:11:31 hno Exp $
+#  $Id: Makefile.in,v 1.3 2001/04/20 09:58:32 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -10,7 +10,7 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 exec_suffix	= @exec_suffix@
 top_srcdir	= @top_srcdir@
-bindir		= @bindir@
+libexecdir		= @libexecdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
@@ -36,10 +36,10 @@ INCLUDE		= -I. -I../../../../../include -I$(top_srcdir)/include
 CFLAGS		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS)
 
-PROGS		= $(NO_CHECK).pl
+LIBPROGS	= $(NO_CHECK).pl
 OBJS		= $(NO_CHECK)
 
-all:    $(PROGS)
+all:    $(LIBPROGS)
 
 #$(OBJS): 
 
@@ -51,27 +51,27 @@ install-mkdirs:
 		echo "mkdir $(prefix)"; \
 		mkdir -p $(prefix); \
 	fi
-	-@if test ! -d $(bindir); then \
-		echo "mkdir $(bindir)"; \
-		mkdir -p $(bindir); \
+	-@if test ! -d $(libexecdir); then \
+		echo "mkdir $(libexecdir)"; \
+		mkdir -p $(libexecdir); \
 	fi
 
 install: all install-mkdirs
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
+	@for f in $(LIBPROGS); do \
+		if test -f $(libexecdir)/$$f; then \
+			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
 		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
+		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
 
 clean: 
-	-rm -rf *.o *pure_* core $(PROGS)
+	-rm -rf *.o *pure_* core $(LIBPROGS)
 
 distclean:     clean
 	-rm -f Makefile