summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-18 20:45:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:43 -0500
commit42f9c678c0964dc91671e2fe2569cddd3e96560a (patch)
treec2be521026defb920c3c7030ea6fca9a1ed50899
parent40f729aecb1c07e23f8481c4529dd5f2b8617593 (diff)
downloadsamba-42f9c678c0964dc91671e2fe2569cddd3e96560a.tar.gz
samba-42f9c678c0964dc91671e2fe2569cddd3e96560a.tar.bz2
samba-42f9c678c0964dc91671e2fe2569cddd3e96560a.zip
r14547: Don't install pidl - it fails on the buildfarm as it doesn't obey $PREFIX. I should've remembered, as this problem has hit me before...
(This used to be commit 6a03e18ab881060f67c0313bd2ea4680b6a45f9f)
-rw-r--r--source4/main.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/main.mk b/source4/main.mk
index 7249afd808..e86dbd6b84 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -82,7 +82,7 @@ PKGCONFIGDIR = $(LIBDIR)/pkgconfig
LMHOSTSFILE = $(CONFIGDIR)/lmhosts
install: showlayout installbin installdat installswat installmisc installlib \
- installheader installpc installplugins installpidl
+ installheader installpc installplugins
# DESTDIR is used here to prevent packagers wasting their time
# duplicating the Makefile. Remove it and you will have the privilege
@@ -150,7 +150,7 @@ installpc: installdirs
@$(SHELL) $(srcdir)/script/installpc.sh $(srcdir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader \
- uninstallplugins uninstallpidl
+ uninstallplugins
uninstallmisc:
#FIXME
@@ -179,7 +179,7 @@ ctags:
ctags `find $(srcdir) -name "*.[ch]"`
pidl/Makefile: pidl/Makefile.PL
- cd pidl && $(PERL) Makefile.PL INSTALLSITEBIN=$(BINDIR) INSTALLSCRIPT=$(BINDIR) INSTALLSITEMAN1DIR=$(MANDIR)/man1 INSTALLSITEMAN3DIR=$(MANDIR)/man3
+ cd pidl && $(PERL) Makefile.PL
installpidl: pidl/Makefile
$(MAKE) -C pidl install