Lines 1-6
Link Here
|
1 |
--- Makefile.in.orig Thu Aug 2 07:36:22 2007 |
1 |
--- Makefile.in.orig 2008-06-19 05:34:51.000000000 +0900 |
2 |
+++ Makefile.in Thu Aug 2 23:00:21 2007 |
2 |
+++ Makefile.in 2008-06-26 21:27:22.000000000 +0900 |
3 |
@@ -79,7 +79,7 @@ |
3 |
@@ -81,7 +81,7 @@ |
4 |
MV = @MV@ |
4 |
MV = @MV@ |
5 |
RM = @RM@ |
5 |
RM = @RM@ |
6 |
RMF = @RM@ -f |
6 |
RMF = @RM@ -f |
Lines 9-15
Link Here
|
9 |
FIND = @FIND@ |
9 |
FIND = @FIND@ |
10 |
XARGS = @XARGS@ |
10 |
XARGS = @XARGS@ |
11 |
LDCONFIG = @LDCONFIG@ |
11 |
LDCONFIG = @LDCONFIG@ |
12 |
@@ -92,16 +92,16 @@ |
12 |
@@ -94,16 +94,16 @@ |
13 |
LEXFLAGS = |
13 |
LEXFLAGS = |
14 |
|
14 |
|
15 |
INSTALL = @INSTALL@ |
15 |
INSTALL = @INSTALL@ |
Lines 32-38
Link Here
|
32 |
|
32 |
|
33 |
USER_LD_FLAGS = @user_ldflags@ |
33 |
USER_LD_FLAGS = @user_ldflags@ |
34 |
LIBS_X = @x_libs@ |
34 |
LIBS_X = @x_libs@ |
35 |
@@ -120,7 +120,7 @@ |
35 |
@@ -122,7 +122,7 @@ |
36 |
AFTER_MAN_DIR = $(DESTDIR)@mandir@/man3 |
36 |
AFTER_MAN_DIR = $(DESTDIR)@mandir@/man3 |
37 |
AFTER_APP_MAN_DIR = $(DESTDIR)@mandir@/man1 |
37 |
AFTER_APP_MAN_DIR = $(DESTDIR)@mandir@/man1 |
38 |
AFTER_SHAREDIR = $(DESTDIR)@datadir@/$(LIB_DIR_NAME) |
38 |
AFTER_SHAREDIR = $(DESTDIR)@datadir@/$(LIB_DIR_NAME) |
Lines 41-47
Link Here
|
41 |
|
41 |
|
42 |
# We want to build both static and dynamic libs, as some service apps may need |
42 |
# We want to build both static and dynamic libs, as some service apps may need |
43 |
# static library as they gets run at compile time (ASDocGen for example) |
43 |
# static library as they gets run at compile time (ASDocGen for example) |
44 |
@@ -161,11 +161,10 @@ |
44 |
@@ -163,11 +163,10 @@ |
45 |
install.script: |
45 |
install.script: |
46 |
|
46 |
|
47 |
install.dyn: mkdir |
47 |
install.dyn: mkdir |
Lines 56-71
Link Here
|
56 |
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ |
56 |
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ |
57 |
if test `uname` = "Linux"; then \ |
57 |
if test `uname` = "Linux"; then \ |
58 |
if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ |
58 |
if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ |
59 |
@@ -230,7 +229,7 @@ |
59 |
@@ -232,7 +231,7 @@ |
60 |
) |
60 |
) |
61 |
|
61 |
|
62 |
install.apps: install.lib |
62 |
install.apps: install.lib |
63 |
- @(cd apps; make install || exit 1) |
63 |
- @(if test -d apps; then cd apps; make install || exit 1; fi) |
64 |
+ @(cd apps; $(MAKE) install || exit 1) |
64 |
+ @(if test -d apps; then cd apps; $(MAKE) install || exit 1; fi) |
65 |
|
65 |
|
66 |
# uninstallation targets : |
66 |
# uninstallation targets : |
67 |
# |
67 |
# |
68 |
@@ -389,11 +388,8 @@ |
68 |
@@ -391,11 +390,8 @@ |
69 |
$(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR) |
69 |
$(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR) |
70 |
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED) |
70 |
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED) |
71 |
|
71 |
|
Lines 79-96
Link Here
|
79 |
$(LIB_OBJS) |
79 |
$(LIB_OBJS) |
80 |
|
80 |
|
81 |
install.man: |
81 |
install.man: |
82 |
@@ -402,8 +398,8 @@ |
82 |
@@ -421,7 +417,7 @@ |
83 |
cd doc/man; \ |
|
|
84 |
for f in `ls *.man`; do \ |
85 |
page_name=`echo $$f| awk -F . '{print $$1}'`; \ |
86 |
- echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \ |
87 |
- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \ |
88 |
+ echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \ |
89 |
+ $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \ |
90 |
done; cd ../..; \ |
91 |
fi |
92 |
|
93 |
@@ -419,7 +415,7 @@ |
94 |
cd ../..; \ |
83 |
cd ../..; \ |
95 |
fi |
84 |
fi |
96 |
|
85 |
|