| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | diff -Naur patch.org/ruli-0.36/Makefile patch.new/ruli-0.36/Makefile |
| 2 | --- ruli-0.36/Makefile 2015-09-10 15:14:13.952262350 -0400 |
| 3 | +++ ruli-0.36/Makefile 2015-09-10 15:14:38.628261620 -0400 |
| 4 | @@ -7,17 +7,17 @@ |
| 5 | .PHONY: default |
| 6 | default: |
| 7 | $(MAKE) -C src |
| 8 | - $(MAKE) -C sample |
| 9 | +# $(MAKE) -C sample |
| 10 | |
| 11 | .PHONY: clean |
| 12 | clean: |
| 13 | $(MAKE) -C src clean |
| 14 | - $(MAKE) -C sample clean |
| 15 | +# $(MAKE) -C sample clean |
| 16 | |
| 17 | .PHONY: install |
| 18 | install: |
| 19 | $(MAKE) -C src install |
| 20 | - $(MAKE) -C sample install |
| 21 | +# $(MAKE) -C sample install |
| 22 | |
| 23 | .PHONY: dpkg |
| 24 | dpkg: |
| 25 | |
| 26 | ===================================================================== |
| 27 | |
| 28 | diff -Naur patch.org/git/src/Makefile patch.new/git/src/Makefile |
| 29 | --- ruli-0.36/src/Makefile 2005-06-13 12:34:53.000000000 -0400 |
| 30 | +++ ruli-0.36/src/Makefile 2015-09-11 09:46:06.290287347 -0400 |
| 31 | @@ -18,9 +18,9 @@ |
| 32 | # |
| 33 | # Debian packaging likes this: OOP_BASE_DIR = /usr |
| 34 | # |
| 35 | -OOP_BASE_DIR = /usr/local/oop |
| 36 | -OOP_INCLUDE_DIR = $(OOP_BASE_DIR)/include |
| 37 | -OOP_LIB_DIR = $(OOP_BASE_DIR)/lib |
| 38 | +#OOP_BASE_DIR = /usr/local/oop |
| 39 | +OOP_INCLUDE_DIR = ${PKG_CONFIG_SYSROOT_DIR}/$(includedir)/ |
| 40 | +#OOP_LIB_DIR = $(OOP_BASE_DIR)/lib |
| 41 | |
| 42 | # |
| 43 | # INSTALL_BASE_DIR indicates where RULI |
| 44 | @@ -30,11 +30,11 @@ |
| 45 | # |
| 46 | # Debian packaging likes this: INSTALL_BASE_DIR = $(DESTDIR)/usr |
| 47 | # |
| 48 | -INSTALL_BASE_DIR = ../install/ruli |
| 49 | -INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include |
| 50 | -INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib |
| 51 | -INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man |
| 52 | -INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 |
| 53 | +#INSTALL_BASE_DIR = ../install/ruli |
| 54 | +#INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include |
| 55 | +#INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib |
| 56 | +#INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man |
| 57 | +#INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3 |
| 58 | |
| 59 | # SunOS, Linux |
| 60 | PLATFORM=$(shell uname) |
| 61 | @@ -45,7 +45,7 @@ |
| 62 | |
| 63 | WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \ |
| 64 | -Wcast-align -Wwrite-strings -Wredundant-decls |
| 65 | -CC = gcc |
| 66 | +#CC = gcc |
| 67 | |
| 68 | # gcc-specific options (not valid for g++) |
| 69 | ifeq ($(CC),gcc) |
| 70 | @@ -58,7 +58,7 @@ |
| 71 | FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \ |
| 72 | $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR) |
| 73 | SOFT_CFLAGS = $(WARN) $(FLAGS) |
| 74 | -CFLAGS = $(WARN) -Werror $(FLAGS) |
| 75 | +CFLAGS = $(WARN) $(FLAGS) |
| 76 | LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \ |
| 77 | ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \ |
| 78 | ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \ |
| 79 | @@ -66,7 +66,7 @@ |
| 80 | ruli_getaddrinfo.o |
| 81 | SHAREDOBJ = $(LIBOBJ:%.o=%.os) |
| 82 | SONAME = libruli.so.4 |
| 83 | -LDFLAGS = -L$(OOP_LIB_DIR) |
| 84 | +#LDFLAGS = -L$(OOP_LIB_DIR) |
| 85 | |
| 86 | COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c |
| 87 | SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c |
| 88 | @@ -89,19 +89,19 @@ |
| 89 | strip: ruli |
| 90 | strip $(SONAME) libruli.a |
| 91 | |
| 92 | -.PHONY: install |
| 93 | -install: ruli |
| 94 | - mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) |
| 95 | - cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) |
| 96 | - cp *.h $(INSTALL_INCLUDE_DIR) |
| 97 | - cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) |
| 98 | - cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so |
| 99 | - @echo |
| 100 | - @echo "REMINDER:" |
| 101 | - @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" |
| 102 | - @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" |
| 103 | - @echo "# ldconfig" |
| 104 | - @echo |
| 105 | +#.PHONY: install |
| 106 | +#install: ruli |
| 107 | +# mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR) |
| 108 | +# cp $(SONAME) libruli.a $(INSTALL_LIB_DIR) |
| 109 | +# cp *.h $(INSTALL_INCLUDE_DIR) |
| 110 | +# cp ../doc/man/*.3 $(INSTALL_MAN3_DIR) |
| 111 | +# cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so |
| 112 | +# @echo |
| 113 | +# @echo "REMINDER:" |
| 114 | +# @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:" |
| 115 | +# @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf" |
| 116 | +# @echo "# ldconfig" |
| 117 | +# @echo |
| 118 | |
| 119 | .PHONY: ruli |
| 120 | ruli: $(SONAME) libruli.a |
| 121 | |
| 122 | |