summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-05-16 01:17:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:45 -0500
commit03435f5de11b364d6a7bb8bf99c12afd5cdd286e (patch)
treef86834715b6b4f5f4189be393f442092d87b2caf /source4
parentc71a11c7ad506fd1c9e5cf33b930e378fc9b8553 (diff)
downloadsamba-03435f5de11b364d6a7bb8bf99c12afd5cdd286e.tar.gz
samba-03435f5de11b364d6a7bb8bf99c12afd5cdd286e.tar.bz2
samba-03435f5de11b364d6a7bb8bf99c12afd5cdd286e.zip
r6802: - fixed CFLAGS
- don't fail if we don't have xsltproc (This used to be commit 235f5c510b4b68edf2a36d049bc0ff2afb73fd72)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/talloc/Makefile.in10
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index faf4382b39..6efa9e1920 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -1,4 +1,3 @@
-OPT = -O
prefix = @prefix@
exec_prefix = @exec_prefix@
includedir = @includedir@
@@ -7,8 +6,7 @@ mandir = @mandir@
XSLTPROC = @XSLTPROC@
INSTALLCMD = @INSTALL@
CC = @CC@
-
-CFLAGS = $(OPT)
+CFLAGS=@CFLAGS@
LIBOBJ = talloc.o
@@ -26,15 +24,15 @@ install: all doc
${INSTALLCMD} -m 644 talloc.h $(includedir)
${INSTALLCMD} -m 644 talloc.pc $(libdir)/pkgconfig
${INSTALLCMD} -d ${mandir}/man3
- ${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
+ test -z "$(XSLTPROC)" || ${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
doc: talloc.3
%.3: %.3.xml
- $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+ test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
%.html: %.xml
- $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
+ test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
clean:
rm -f *~ *.o testsuite *.gc??