blob: c77bcd5d491277fb75addac09a43c2281d5b0221 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- a/Config
+++ b/Config
@@ -24,9 +24,9 @@
# Name of local configuration file (location is $HOME.)
YAPS_LCFGFILE = .yapsrc
# Directory for installing the binary
-YAPS_BINDIR = /usr/local/bin
+YAPS_BINDIR = /usr/bin
# Directory for optional support files
-YAPS_LIBDIR = /usr/local/lib/yaps
+YAPS_LIBDIR = /usr/lib/yaps
# User/Group/Mode for yaps
YAPS_USER = bin
YAPS_GROUP = uucp
@@ -43,12 +43,12 @@
ifdef SLANG
LDEFS += -DSCRIPT_SLANG
LLIBS += -lslang
-MATH = True
+#MATH = True
endif
ifdef LUA
LDEFS += -DSCRIPT_LUA
-LLIBS += -llualib -llua
-MATH = True
+LLIBS += `pkg-config --libs lua`
+#MATH = True
endif
ifdef MATH
LLIBS += -lm
--- a/Makefile
+++ b/Makefile
@@ -33,19 +33,19 @@
lynx -cfg=/dev/null -nolist -dump $< > $@
install: $(DSTFLE) $(CFGFILE)
- if [ ! -d $(YAPS_LIBDIR) ]; then \
- install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(YAPS_LIBDIR) ; \
+ if [ ! -d $(DESTDIR)$(YAPS_LIBDIR) ]; then \
+ install -d -m 755 $(DESTDIR)$(YAPS_LIBDIR) ; \
fi
@if [ -f contrib/Makefile ]; then \
$(MAKE) -C contrib install ; \
fi
$(DSTFLE): yaps
- install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
+ install -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
$(CFGFILE): yaps.rc
@if [ ! -f $@ ]; then \
- install -o $(YAPS_RCUSER) -g $(YAPS_RCGROUP) -m $(YAPS_RCMODE) -s yaps.rc $@ ; \
+ install -m $(YAPS_RCMODE) -s yaps.rc $(DESTDIR)$@ ; \
fi
clean:
|
GitWeb
