pkgsrc-wip/xrdp/patches/patch-ae

87 lines
2.9 KiB
Text

$NetBSD: patch-ae,v 1.3 2007/02/27 13:15:22 lkundrak Exp $
--- sesman/Makefile.orig 2006-05-26 15:10:14.000000000 +0200
+++ sesman/Makefile
@@ -6,20 +6,12 @@ SESMANOBJ = sesman.o config.o tcp.o sig.
SESRUNOBJ = sesrun.o config.o tcp.o \
os_calls.o d3des.o list.o file.o log.o
-DESTDIR = /usr/local/xrdp
-CFGDIR = /etc/xrdp
-PIDDIR = /var/run
-MANDIR = /usr/local/man
-DOCDIR = /usr/doc/xrdp
-
DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\"
-CFLAGS = -Wall -O2 -I../common $(DEFINES)
-LDFLAGS = -L /usr/gnu/lib $(DEFINES)
+CFLAGS += -Wall -I../common $(DEFINES)
+LDFLAGS += -L /usr/gnu/lib $(DEFINES)
C_OS_FLAGS = $(CFLAGS) -c
-CC = gcc
-
all: pam tools
@@ -28,28 +20,28 @@ nopam: no-pam tools
kerberos: kerberos-base tools
no-pam: $(SESMANOBJ) verify_user.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -ldl -lcrypt
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o $(DLLIB) -lcrypt
pam: $(SESMANOBJ) verify_user_pam.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -ldl -lpam
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o $(DLLIB) -lpam
pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -ldl -lpam -lpam_userpass
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o $(DLLIB) -lpam -lpam_userpass
kerberos-base: $(SESMANOBJ) verify_user_kerberos.o
- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -ldl -lkrb5
+ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o $(DLLIB) -lkrb5
tools: $(SESRUNOBJ)
- $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) -ldl
+ $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(DLLIB)
clean:
rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun
install:
- install sesman $(DESTDIR)/sesman
- install sesrun $(DESTDIR)/sesrun
- install startwm.sh $(DESTDIR)/startwm.sh
- install sesman.ini $(CFGDIR)/sesman.ini
+ $(BSD_INSTALL_PROGRAM) sesman $(DESTDIR)/bin/sesman
+ $(BSD_INSTALL_PROGRAM) sesrun $(DESTDIR)/bin/sesrun
+ $(BSD_INSTALL_SCRIPT) startwm.sh $(DESTDIR)/bin/startwm.sh
+ $(BSD_INSTALL_DATA) sesman.ini $(CFGDIR)/sesman.ini
installdeb:
install sesman $(DESTDIRDEB)/usr/xrdp/sesman
@@ -58,16 +50,16 @@ installdeb:
install sesman.ini $(DESTDIRDEB)/etc/xrdp/sesman.ini
os_calls.o: ../common/os_calls.c
- $(CC) $(C_OS_FLAGS) ../common/os_calls.c
+ $(CC) $(CPPFLAGS) $(C_OS_FLAGS) ../common/os_calls.c
d3des.o: ../common/d3des.c
- $(CC) $(C_OS_FLAGS) ../common/d3des.c
+ $(CC) $(CPPFLAGS) $(C_OS_FLAGS) ../common/d3des.c
list.o: ../common/list.c
- $(CC) $(C_OS_FLAGS) ../common/list.c
+ $(CC) $(CPPFLAGS) $(C_OS_FLAGS) ../common/list.c
file.o: ../common/file.c
- $(CC) $(C_OS_FLAGS) ../common/file.c
+ $(CC) $(CPPFLAGS) $(C_OS_FLAGS) ../common/file.c
log.o: ../common/log.c
- $(CC) $(C_OS_FLAGS) ../common/log.c
+ $(CC) $(CPPFLAGS) $(C_OS_FLAGS) ../common/log.c