1 diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/Makefile mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/Makefile
2 --- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/Makefile 2019-03-22 02:34:36.000000000 +0100
3 +++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/Makefile 2019-04-09 07:39:01.369907820 +0200
8 - install mrg-host mrg-terminal mrg-edit mrg-browser $(DESTDIR)$(PREFIX)/bin/
9 + cp -a mrg-host mrg-terminal mrg-edit mrg-browser $(DESTDIR)$(PREFIX)/bin/
11 luajit/mrg_h.lua: lib/*.h Makefile
12 echo "local ffi = require'ffi'" > $@
13 diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/bin mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/bin
14 --- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/bin 2019-03-22 02:34:36.000000000 +0100
15 +++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/bin 2019-04-09 07:36:36.485673498 +0200
17 BIN_LD_FLAGS += $(shell test "$(BIN_PKGMODULES)" 2>/dev/null && pkg-config $(BIN_PKGMODULES) --libs)
19 $(BINARY): $(BIN_CFILES) $(LIBNAME_A)
20 - @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
21 + echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
22 $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -o $@
24 $(BINARY).efence: $(BIN_CFILES) $(LIBNAME_A)
25 - @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
26 + echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
27 $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -lefence -o $@
30 diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/lib mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/lib
31 --- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/lib 2019-03-22 02:34:36.000000000 +0100
32 +++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/lib 2019-04-09 07:38:13.704082927 +0200
34 LIBNAME_A=$(LIBNAME).a
36 $(LIBNAME).a: $(LIB_OBJS)
37 - @echo " AR" $@;ar rcs $@ $(LIB_OBJS)
38 + echo " AR" $@;ar rcs $@ $(LIB_OBJS)
40 CLEAN_FILES += symbols
42 symbols: Makefile $(LIB_OBJS)
43 - @echo " gen" $@; nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' | grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
44 + echo " gen" $@; nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' | grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
46 $(LIBNAME).$(LIBEXT): $(LIB_OBJS) symbols
47 - @echo " LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
48 + echo " LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
50 # this rule is generic and could also belong with bin..
51 # we try to be overly generic and throw in the cflags of both lib and bin..
52 %.o: %.c *.h $(LIB_HFILES)
53 - @echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
54 + echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
56 lib/%.o: lib/%.c lib/*.h $(LIB_HFILES)
57 - @echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
58 + echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
60 LIBDIR ?= $(PREFIX)/lib
63 EXAMPLES_LD_FLAGS += $(shell test "$(EXAMPLES_PKGMODULES)" 2>/dev/null && pkg-config $(EXAMPLES_PKGMODULES) --libs | sed 's/-Wl,--export-dynamic//' | sed 's/-pthread//')
65 examples/%: examples/%.c $(LIBNAME).a
66 - @echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS) $< $(LIBNAME).a $(EXAMPLES_LD_FLAGS) $(LIB_LD_FLAGS) -o $@
67 + echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS) $< $(LIBNAME).a $(EXAMPLES_LD_FLAGS) $(LIB_LD_FLAGS) -o $@
71 CLEAN_FILES += $(EXAMPLES_BINS)
74 - @echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
75 - @echo "$(LIBNAME).a static library"
76 + echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
77 + echo "$(LIBNAME).a static library"
78 diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/pkgconfig mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/pkgconfig
79 --- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/pkgconfig 2019-03-22 02:34:36.000000000 +0100
80 +++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/pkgconfig 2019-04-09 07:38:42.905609331 +0200
83 @echo "prefix=$(PREFIX)" > $@
84 @echo exec_prefix=\$${prefix} >> $@
85 - @echo libdir=\$${prefix}/lib >> $@
86 + @echo "libdir=$(LIBDIR)" >> $@
87 @echo includedir=\$${prefix}/include >> $@
88 @echo apiversion=$(API_VERSION) >> $@