diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-02-15 13:30:55 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-02-15 13:30:55 +1100 |
| commit | 5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c (patch) | |
| tree | 3568dad2be35a6fa96bd065820cec452fed2b61e /source4/lib/talloc | |
| parent | 60b314428008878f949b9fba54825c2f4f900288 (diff) | |
| parent | f3bbe1516c95ac29b3ff51a2b5a91105d315524b (diff) | |
| download | samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.tar.gz samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.tar.bz2 samba-5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 9c12b5b49679d404ac623041f2da944019f97754)
Diffstat (limited to 'source4/lib/talloc')
| -rw-r--r-- | source4/lib/talloc/talloc.mk | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/web/index.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/talloc.mk b/source4/lib/talloc/talloc.mk index d7a0e0d83e..e1fe88c84b 100644 --- a/source4/lib/talloc/talloc.mk +++ b/source4/lib/talloc/talloc.mk @@ -16,7 +16,7 @@ install:: all ${INSTALLCMD} -d $(DESTDIR)$(libdir) ${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig ${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir) - ${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir) + ${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(DESTDIR)$(libdir) ${INSTALLCMD} -d $(DESTDIR)${includedir} ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig diff --git a/source4/lib/talloc/web/index.html b/source4/lib/talloc/web/index.html index 106920e8a5..e53e8960a8 100644 --- a/source4/lib/talloc/web/index.html +++ b/source4/lib/talloc/web/index.html @@ -12,7 +12,7 @@ destructors. It is the core memory allocator used in Samba4, and has made a huge difference in many aspects of Samba4 development.<p> To get started with talloc, I would recommend you read the <a -href="http://samba.org/ftp/unpacked/samba4/source/lib/talloc/talloc_guide.txt">talloc guide</a>. +href="http://samba.org/ftp/unpacked/samba_4_0_test/source/lib/talloc/talloc_guide.txt">talloc guide</a>. <h2>Discussion and bug reports</h2> |