[Bluez-devel] Avoid install of daemon manpage if daemon is disabled

[Bluez-devel] Avoid install of daemon manpage if daemon is disabled

[Daniel Gollub]

[-- Attachment #1: Type: text/plain, Size: 74 bytes --]

Hi Marcel,

simple patch for $subject is attachted.

best regards,
Daniel

[-- Attachment #2: bluez-utils-avoid-manpage-install.diff --]
[-- Type: text/x-diff, Size: 1818 bytes --]

Index: hcid/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/Makefile.am,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile.am
--- hcid/Makefile.am	25 Jan 2007 15:09:26 -0000	1.73
+++ hcid/Makefile.am	26 Mar 2007 17:24:49 -0000
@@ -41,7 +41,9 @@ INCLUDES = -I$(top_srcdir)/common -I$(to
 
 BUILT_SOURCES = parser.h
 
+if HCID
 man_MANS = hcid.8 hcid.conf.5
+endif
 
 AM_YFLAGS = -d
 
Index: hidd/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/hidd/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- hidd/Makefile.am	13 Feb 2007 14:49:59 -0000	1.15
+++ hidd/Makefile.am	26 Mar 2007 17:24:49 -0000
@@ -11,7 +11,9 @@ AM_CFLAGS = @BLUEZ_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common
 
+if HIDD
 man_MANS = hidd.1
+endif
 
 EXTRA_DIST = $(man_MANS) fakehid.txt
 
Index: pand/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/pand/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- pand/Makefile.am	21 Mar 2007 21:33:15 -0000	1.8
+++ pand/Makefile.am	26 Mar 2007 17:24:49 -0000
@@ -11,7 +11,9 @@ AM_CFLAGS = @BLUEZ_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common
 
+if PAND
 man_MANS = pand.1
+endif
 
 EXTRA_DIST = $(man_MANS)
 
Index: sdpd/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/sdpd/Makefile.am,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.am
--- sdpd/Makefile.am	20 Jan 2007 05:26:20 -0000	1.18
+++ sdpd/Makefile.am	26 Mar 2007 17:24:50 -0000
@@ -17,7 +17,9 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common
 
+if SDPD
 man_MANS = sdpd.8
+endif
 
 EXTRA_DIST = $(man_MANS)
 

[-- Attachment #3: Type: text/plain, Size: 345 bytes --]

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[-- Attachment #4: Type: text/plain, Size: 164 bytes --]

_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] Avoid install of daemon manpage if daemon is disabled

[Marcel Holtmann]

Hi Daniel,

> simple patch for $subject is attachted.

good catch, but the patch is wrong. You also have to modify EXTRA_DIST.
Otherwise a call to "make dist" is no longer including the manual pages
in the tarball. I fixed that and committed the patch.

Regards

Marcel



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel