You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

62 lines
1.7 KiB

Index: Makefile
--- Makefile.orig 2008-12-06 18:36:33 +0100
+++ Makefile 2009-05-03 10:01:18 +0200
@@ -103,11 +103,11 @@
linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
+ @$(LD) $(LIBS) -o $@ $^ $(LIBS)
ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
src/settings.o: CFLAGS+=-DSYSCONFDIR=\"${sysconfdir}\"
@@ -119,11 +119,11 @@
ctrlproxyd$(EXEEXT): $(daemon_objs) $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
ctrlproxy-admin$(EXEEXT): src/admin-cmd.o
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
%.o: %.c
@echo Compiling $<
Index: Makefile.settings.in
--- Makefile.settings.in.orig 2008-12-06 18:36:33 +0100
+++ Makefile.settings.in 2009-05-03 09:59:50 +0200
@@ -10,12 +10,12 @@
INSTALL = @INSTALL@
bindir = @bindir@
sbindir = @sbindir@
-docdir = @prefix@/share/doc/ctrlproxy
+docdir = @prefix@/share/ctrlproxy
modulesdir = @libdir@/ctrlproxy
libdir = @libdir@
includedir = @includedir@
mandir = @mandir@
-destincludedir = $(includedir)/ctrlproxy-3.0
+destincludedir = $(includedir)/ctrlproxy
cdatadir = @datadir@/ctrlproxy
sysconfdir = @sysconfdir@
localstatedir = @localstatedir@
Index: src/internals.h
--- src/internals.h.orig 2008-12-06 18:36:33 +0100
+++ src/internals.h 2009-05-03 09:59:50 +0200
@@ -28,8 +28,8 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include <netdb.h>
#include <sys/types.h>
+#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>