Patchwork patch: Improve contacting infos in README

login
register
about
Submitter Joerg Mayer
Date 2009-08-23 05:50:52
Message ID <20090823055052.GP23977@thot.informatik.uni-kl.de>
Download mbox | patch
Permalink /patch/172/
State Superseded
Headers show

Comments

Joerg Mayer - 2009-08-23 05:50:52
see attached patch - patch is too small to be copyrightable (if there is
such a word).

 ciao
    Joerg
Carl-Daniel Hailfinger - 2009-08-23 11:42:23
Hi Jörg,

On 23.08.2009 07:50, Joerg Mayer wrote:
> see attached patch - patch is too small to be copyrightable (if there is
> such a word).
>   

It seems the attached patch was not the one declared in the subject.

Regards,
Carl-Daniel

Patch

Index: Makefile
===================================================================
--- Makefile	(revision 696)
+++ Makefile	(working copy)
@@ -75,12 +75,13 @@ 
 endif
 endif
 
+FTDILIBS = $(shell pkg-config --libs libftdi)
 FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
 
-FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi")
+FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && echo $(FTDILIBS))
 
 $(PROGRAM): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS)
+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(FEATURE_LIBS) $(LIBS)
 
 # TAROPTIONS reduces information leakage from the packager's system.
 # If other tar programs support command line arguments for setting uid/gid of
@@ -133,7 +134,7 @@ 
 		   echo "struct ftdi_context *ftdic = NULL;";	   \
 		   echo "int main(int argc, char **argv)"; \
 		   echo "{ return ftdi_init(ftdic); }"; ) > .featuretest.c )
-	@$(CC) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest $(LIBS) -lftdi >/dev/null 2>&1 &&	\
+	@$(CC) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest $(FTDILIBS) $(LIBS)>/dev/null 2>&1 &&	\
 		( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) ||	\
 		( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp )
 	@$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features