|
1 --- source3/Makefile.in.orig Sun Mar 6 13:48:05 2011 |
|
2 +++ source3/Makefile.in Thu Jun 2 21:37:51 2011 |
|
3 @@ -181,7 +181,7 @@ |
|
4 $(ISA) \ |
|
5 -I$(srcdir)/lib \ |
|
6 -I.. \ |
|
7 - -I../source4 \ |
|
8 + -I$(srcdir)/../source4 \ |
|
9 -D_SAMBA_BUILD_=3 |
|
10 |
|
11 PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ |
|
12 @@ -1885,14 +1885,14 @@ |
|
13 $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \ |
|
14 fi |
|
15 -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) |
|
16 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
17 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include |
|
18 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
19 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)$(INCLUDEDIR) |
|
20 |
|
21 uninstalllibtalloc:: |
|
22 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` |
|
23 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` |
|
24 -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)` |
|
25 - -rm -f $(DESTDIR)${prefix}/include/talloc.h |
|
26 + -rm -f $(DESTDIR)$(INCLUDEDIR)/talloc.h |
|
27 |
|
28 libs:: libtalloc |
|
29 installlibs:: @INSTALL_LIBTALLOC@ |
|
30 @@ -1965,14 +1965,14 @@ |
|
31 $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \ |
|
32 fi |
|
33 -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR) |
|
34 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
35 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include |
|
36 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
37 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)$(INCLUDEDIR) |
|
38 |
|
39 uninstalllibtdb:: |
|
40 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` |
|
41 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` |
|
42 -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)` |
|
43 - -rm -f $(DESTDIR)${prefix}/include/tdb.h |
|
44 + -rm -f $(DESTDIR)$(INCLUDEDIR)/tdb.h |
|
45 |
|
46 libs:: libtdb |
|
47 installlibs:: @INSTALL_LIBTDB@ |
|
48 @@ -2059,13 +2059,13 @@ |
|
49 ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \ |
|
50 $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \ |
|
51 fi |
|
52 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
53 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)${prefix}/include |
|
54 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
55 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)$(INCLUDEDIR) |
|
56 |
|
57 uninstalllibwbclient:: |
|
58 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` |
|
59 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` |
|
60 - -rm -f $(DESTDIR)${prefix}/include/wbclient.h |
|
61 + -rm -f $(DESTDIR)$(INCLUDEDIR)/wbclient.h |
|
62 |
|
63 libs:: libwbclient |
|
64 installlibs:: @INSTALL_LIBWBCLIENT@ |
|
65 @@ -2236,14 +2236,14 @@ |
|
66 $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \ |
|
67 fi |
|
68 -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR) |
|
69 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
70 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include |
|
71 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
72 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)$(INCLUDEDIR) |
|
73 |
|
74 uninstalllibnetapi:: |
|
75 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` |
|
76 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET_SONAME)` |
|
77 -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_STATIC_TARGET)` |
|
78 - -rm -f $(DESTDIR)${prefix}/include/netapi.h |
|
79 + -rm -f $(DESTDIR)$(INCLUDEDIR)/netapi.h |
|
80 |
|
81 libs:: libnetapi |
|
82 installlibs:: @INSTALL_LIBNETAPI@ |
|
83 @@ -2314,8 +2314,8 @@ |
|
84 $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \ |
|
85 fi |
|
86 -$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR) |
|
87 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
88 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)${prefix}/include |
|
89 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
90 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)$(INCLUDEDIR) |
|
91 |
|
92 installclientlib:: installlibsmbclient |
|
93 |
|
94 @@ -2323,7 +2323,7 @@ |
|
95 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` |
|
96 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` |
|
97 -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_STATIC_TARGET)` |
|
98 - -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h |
|
99 + -rm -f $(DESTDIR)$(INCLUDEDIR)/libsmbclient.h |
|
100 |
|
101 uninstallclientlib:: uninstalllibsmbclient |
|
102 |
|
103 @@ -2399,14 +2399,14 @@ |
|
104 $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \ |
|
105 fi |
|
106 -$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR) |
|
107 - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include |
|
108 - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)${prefix}/include |
|
109 + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR) |
|
110 + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)$(INCLUDEDIR) |
|
111 |
|
112 uninstalllibsmbsharemodes:: |
|
113 -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` |
|
114 -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` |
|
115 -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_STATIC_TARGET)` |
|
116 - -rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h |
|
117 + -rm -f $(DESTDIR)$(INCLUDEDIR)/smb_share_modes.h |
|
118 |
|
119 libs:: libsmbsharemodes |
|
120 installlibs:: @INSTALL_LIBSMBSHAREMODES@ |