projects/aports·blob master · refs

65 lines · 1.7 KiB

1diff -u a/Makefile b/Makefile
2--- a/Makefile 2014-06-01 13:58:41.867584813 +0400
3+++ b/Makefile 2014-06-01 14:20:47.460700951 +0400
4@@ -5,14 +5,11 @@
5 DEFINES += -DUSE_LIBWRAP
6 endif
7
8-# If you don't have it in /var/log/subsys, uncomment and define
9-#CFLAGS += -DLOCKFILE_DIR=\"/var/log\"
10+# If you don't have it in /var/lock/subsys, uncomment and define
11+CFLAGS += -DLOCKFILE_DIR=\"/var/lock\"
12
13-# GNU target string
14-CROSS =
15-
16-CC = $(CROSS)gcc
17-STRIP = $(CROSS)strip
18+CC := gcc
19+STRIP := strip
20
21 CFLAGS += -O2 -Wall
22
23diff --git a/p910nd.c b/p910nd.c
24index 2fa4454..a58c1f0 100644
25--- a/p910nd.c
26+++ b/p910nd.c
27@@ -133,11 +133,11 @@ extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, char *c
28 #endif
29
30 #define BASEPORT 9100
31-#define PIDFILE "/var/run/p910%cd.pid"
32+#define PIDFILE "/run/p910nd/p910nd.%c.pid"
33 #ifdef LOCKFILE_DIR
34 #define LOCKFILE LOCKFILE_DIR "/p910%cd"
35 #else
36-#define LOCKFILE "/var/lock/subsys/p910%cd"
37+#define LOCKFILE "/run/lock/p910nd"
38 #endif
39 #ifndef PRINTERFILE
40 #define PRINTERFILE "/dev/lp%c"
41
42diff --git a/Makefile b/Makefile
43index 53db51f..6012199 100644
44--- a/Makefile
45+++ b/Makefile
46@@ -18,5 +18,4 @@ STRIP := strip
47 INSTALL = install
48 BINDIR = /usr/sbin
49-CONFIGDIR = /etc/sysconfig
50 SCRIPTDIR = /etc/init.d
51 MANDIR = /usr/share/man/man8
52
53@@ -29,11 +29,10 @@ $(PROG): p910nd.c
54 strip: $(PROG)
55 $(STRIP) -s $(PROG)
56
57 install: $(PROG) $(MANPAGE)
58- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(CONFIGDIR) \
59+ mkdir -p $(DESTDIR)$(BINDIR) \
60 $(DESTDIR)$(SCRIPTDIR) $(DESTDIR)$(MANDIR)
61 $(INSTALL) $(PROG) $(DESTDIR)$(BINDIR)
62- $(INSTALL) -m 644 $(CONFIG) $(DESTDIR)$(CONFIGDIR)/$(PROG)
63 $(INSTALL) $(INITSCRIPT) $(DESTDIR)$(SCRIPTDIR)/$(PROG)
64 $(INSTALL) -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR)
65