aports/testing/lout/makefile.patch
Paul Bredbury 1b09b41556 testing/lout: tidy for new upstream
The post-install script isn't particularly needed - done by makefile instead.

The makefile does not properly support $pkgdir being different to inside /usr, hence package() being slightly inelegant.
2021-10-23 22:15:53 +00:00

61 lines
1.7 KiB
Diff

diff '--color=auto' -Naur a/makefile b/makefile
--- a/makefile 2021-10-23 19:51:45.196005946 +0100
+++ b/makefile 2021-10-23 21:34:11.902953403 +0100
@@ -274,16 +274,11 @@
#TRACING = -g -fno-omit-frame-pointer -fsanitize=undefined
#TRACING = -g -fno-omit-frame-pointer -fsanitize=address -fsanitize-recover
-#PREFIX = /home/jeff
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
-#LOUTLIBDIR = $(PREFIX)/lout.lib
-#LOUTDOCDIR = $(PREFIX)/lout.doc
-#MANDIR = $(PREFIX)/lout.man
-LIBDIR = $(PREFIX)/share/lout-$(VERSION)
-LOUTLIBDIR = $(LIBDIR)/lib
-LOUTDOCDIR = $(LIBDIR)/doc
-MANDIR = $(LIBDIR)/man
+LOUTLIBDIR = $(PREFIX)/share/lout
+LOUTDOCDIR = $(PREFIX)/share/doc/lout
+MANDIR = $(PREFIX)/share/man/man1
LIBFONT = font
LIBMAPS = maps
@@ -295,7 +290,7 @@
CHARIN = 1
CHAROUT = 0
-USELOC = 1
+USELOC = 0
LOC_FR = fr
LOC_DE = de
@@ -315,7 +310,7 @@
# Add WARN to COPTS for more checking
WARN = -Wpointer-arith -Wclobbered -Wempty-body -Wmissing-parameter-type -Wmissing-field-initializers -Wold-style-declaration -Wtype-limits -Wuninitialized -Winit-self -Wlogical-op -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wbad-function-cast
-COPTS = -ansi -pedantic -Wall -O3 -pipe
+COPTS += -ansi -pedantic
CFLAGS = -DOS_UNIX=$(OSUNIX) \
-DOS_DOS=$(OSDOS) \
@@ -349,7 +344,7 @@
z49.o z50.o z51.o z52.o
lout: $(OBJS)
- $(CC) $(CFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
chmod a+x lout
$(OBJS): externs.h
@@ -357,7 +352,7 @@
externs.h:
prg2lout: prg2lout.c
- $(CC) $(COPTS) -o prg2lout prg2lout.c
+ $(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
chmod a+x prg2lout
all: lout prg2lout