]>
Commit | Line | Data |
---|---|---|
d629ce07 CS |
1 | diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.am |
2 | --- squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path 2010-09-04 05:25:57.000000000 +0200 | |
3 | +++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am 2010-09-05 18:38:05.000000000 +0200 | |
4 | @@ -9,14 +9,14 @@ | |
5 | include $(top_srcdir)/src/Common.am | |
6 | ||
7 | # SAMBAPREFIX must point to the directory where Samba has been installed. | |
8 | -# By default, Samba is installed in /usr/local/samba. If you changed this | |
9 | +# By default, Samba is installed in /usr. If you changed this | |
10 | # by using the --prefix option when configuring Samba, you need to change | |
11 | # SAMBAPREFIX accordingly. | |
12 | ||
13 | ## FIXME: autoconf should test for the samba path. | |
14 | ||
15 | SMB_AUTH_HELPER = smb_auth.sh | |
16 | -SAMBAPREFIX=/usr/local/samba | |
17 | +SAMBAPREFIX=/usr | |
18 | SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) | |
19 | ||
20 | libexec_SCRIPTS = $(SMB_AUTH_HELPER) | |
21 | diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.in | |
22 | --- squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path 2010-09-04 05:26:21.000000000 +0200 | |
23 | +++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.in 2010-09-05 18:39:47.000000000 +0200 | |
24 | @@ -291,11 +291,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi | |
25 | -I$(srcdir) | |
26 | ||
27 | # SAMBAPREFIX must point to the directory where Samba has been installed. | |
28 | -# By default, Samba is installed in /usr/local/samba. If you changed this | |
29 | +# By default, Samba is installed in /usr. If you changed this | |
30 | # by using the --prefix option when configuring Samba, you need to change | |
31 | # SAMBAPREFIX accordingly. | |
32 | SMB_AUTH_HELPER = smb_auth.sh | |
33 | -SAMBAPREFIX = /usr/local/samba | |
34 | +SAMBAPREFIX = /usr | |
35 | SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) | |
36 | libexec_SCRIPTS = $(SMB_AUTH_HELPER) | |
37 | smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\" |