diff -urN newt-0.52.11/Makefile.in newt-0.52.11-macosx/Makefile.in
old
|
new
|
|
1 | | LIBS = -lslang |
2 | | LIBTCL = -ltcl8.4 |
| 1 | LIBS = -L/opt/local/lib -lslang |
| 2 | LIBTCL = -L/opt/local/lib -ltcl8.4 -lintl |
3 | 3 | |
4 | 4 | CC = @CC@ |
5 | 5 | CPP = @CPP@ |
6 | 6 | CFLAGS = @CFLAGS@ |
7 | | CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ |
| 7 | CPPFLAGS = -D_GNU_SOURCE -I/opt/local/include @CPPFLAGS@ |
8 | 8 | |
9 | | SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver |
| 9 | SHLIBFLAGS= |
10 | 10 | VERSION = @VERSION@ |
11 | 11 | TAG = r$(subst .,-,$(VERSION)) |
12 | 12 | SONAME = @SONAME@ |
13 | 13 | |
14 | 14 | PYTHONVERS = @PYTHONVERS@ |
15 | | WHIPTCLSO = @WHIPTCLSO@ |
| 15 | WHIPTCLSO = #@WHIPTCLSO@ |
16 | 16 | |
17 | 17 | PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey |
18 | 18 | TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o |
… |
… |
|
50 | 50 | TARGET=depend $(PROGS) |
51 | 51 | endif |
52 | 52 | |
53 | | all: $(TARGET) _snackmodule.so |
| 53 | all: $(TARGET) #_snackmodule.so |
54 | 54 | |
55 | 55 | test: test.o $(LIBNEWT) |
56 | 56 | $(CC) -g -o test test.o $(LIBNEWT) $(LIBS) |
… |
… |
|
70 | 70 | _snackmodule.so: snackmodule.c $(LIBNEWTSH) |
71 | 71 | for ver in $(PYTHONVERS) ; do \ |
72 | 72 | mkdir -p $$ver ;\ |
73 | | $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\ |
74 | | $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . -lnewt ;\ |
| 73 | echo $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o $$ver/snackmodule.o snackmodule.c ;\ |
| 74 | echo $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt ;\ |
75 | 75 | done |
76 | 76 | touch $@ |
77 | 77 | |
78 | 78 | whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) |
79 | | $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt |
| 79 | $(CC) -g -o whiptail $(NDIALOGOBJS) -L. -lnewt $(LIBS) -lpopt |
80 | 80 | |
81 | 81 | whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) |
82 | | $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lpopt |
| 82 | $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt |
83 | 83 | |
84 | 84 | $(LIBNEWT): $(LIBOBJS) |
85 | 85 | ar rv $@ $^ |
… |
… |
|
119 | 119 | install -m 755 whiptail $(instroot)/$(bindir) |
120 | 120 | install -m 644 whiptail.1 $(instroot)/$(man1dir) |
121 | 121 | make -C po datadir=$(instroot)/$(datadir) install |
122 | | install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc |
| 122 | install -m 644 libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc |
123 | 123 | |
124 | | install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so |
| 124 | install-sh: sharedlib $(WHIPTCLSO) #_snackmodule.so |
125 | 125 | [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) |
126 | 126 | install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) |
127 | 127 | ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so |
… |
… |
|
129 | 129 | [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : |
130 | 130 | for ver in $(PYTHONVERS) ; do \ |
131 | 131 | [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ |
132 | | install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ |
133 | | install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ |
| 132 | echo install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ |
| 133 | echo install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ |
134 | 134 | done |
135 | 135 | |
136 | 136 | Makefile: newt.spec |
diff -urN newt-0.52.11/whiptail.c newt-0.52.11-macosx/whiptail.c
old
|
new
|
|
8 | 8 | #include <unistd.h> |
9 | 9 | #include <wchar.h> |
10 | 10 | #include <slang.h> |
| 11 | #include <sys/stat.h> |
11 | 12 | |
12 | 13 | #include "nls.h" |
13 | 14 | #include "dialogboxes.h" |