Lines 1-22
Link Here
|
1 |
--- Makefile-shared-linux.in.orig 2010-01-04 06:49:13.000000000 -0800 |
1 |
--- Makefile-shared-linux.in.orig 2010-02-25 21:44:58.000000000 +0900 |
2 |
+++ Makefile-shared-linux.in 2010-02-04 02:00:24.685902608 -0800 |
2 |
+++ Makefile-shared-linux.in 2010-04-20 18:23:22.000000000 +0900 |
3 |
@@ -1,5 +1,6 @@ |
3 |
@@ -1,5 +1,6 @@ |
4 |
SOVERS=1.26 |
4 |
SOVERS=1.27 |
5 |
+MAJORVERS=1 |
5 |
+MAJORVERS=1 |
6 |
# The build prefix |
6 |
# The build prefix |
7 |
pp= |
7 |
pp= |
8 |
@@ -13,7 +14,7 @@ |
8 |
@@ -14,7 +15,7 @@ |
9 |
sysconfdir = @sysconfdir@ |
9 |
sysconfdir=@sysconfdir@ |
10 |
scd=$(sysconfdir) |
10 |
scd=$(sysconfdir) |
11 |
libdir = @libdir@ |
11 |
libdir=@libdir@ |
12 |
-sharedlibdir = $(libdir)/shared |
12 |
-sharedlibdir=$(libdir)/shared |
13 |
+sharedlibdir = $(libdir) |
13 |
+sharedlibdir=$(libdir) |
14 |
mandir = @mandir@ |
14 |
mandir=@mandir@ |
15 |
includedir = @includedir@ |
15 |
includedir=@includedir@ |
16 |
srcdir = @srcdir@ |
16 |
srcdir=@srcdir@ |
17 |
@@ -74,18 +75,14 @@ |
17 |
@@ -75,18 +76,14 @@ |
18 |
all: $(progs) $(libs) stc-static |
18 |
all: $(progs) $(libs) stc-static |
19 |
-[ -d lib ] || mkdir lib |
19 |
-[ -d lib ] || mkdir lib |
20 |
-[ -d share ] || mkdir share |
20 |
-[ -d share ] || mkdir share |
Lines 35-54
Link Here
|
35 |
chmod 755 share/stc |
35 |
chmod 755 share/stc |
36 |
chmod 755 share/tracecc |
36 |
chmod 755 share/tracecc |
37 |
chmod 755 share/trana |
37 |
chmod 755 share/trana |
38 |
@@ -119,12 +116,6 @@ |
38 |
@@ -120,10 +117,6 @@ |
39 |
find share -type f -exec chmod 644 {} \; |
39 |
find share -type f -exec chmod 644 {} \; |
40 |
cp appdefaults.sample appdefaults |
40 |
cp appdefaults.sample appdefaults |
41 |
chmod 755 showdd |
41 |
chmod 755 showdd |
42 |
- chmod 755 tracecc-gui |
42 |
- chmod 755 tracecc-gui |
43 |
- chmod 755 tracegui.jar |
43 |
- chmod 755 tracegui.jar |
44 |
- find Java/dklibsj/doc -type d -exec chmod ugo+rx {} \; |
44 |
- find Java/doc -type d -exec chmod ugo+rx {} \; |
45 |
- find Java/dklibsj/doc -type f -exec chmod ugo+r {} \; |
45 |
- find Java/doc -type f -exec chmod ugo+r {} \; |
46 |
- find Java/TraceGUI/doc -type d -exec chmod ugo+rx {} \; |
|
|
47 |
- find Java/TraceGUI/doc -type f -exec chmod ugo+r {} \; |
48 |
./showdd $(datadir) >> appdefaults |
46 |
./showdd $(datadir) >> appdefaults |
49 |
touch all |
47 |
touch all |
50 |
chmod 755 rwperlmk.sh |
48 |
chmod 755 rwperlmk.sh |
51 |
@@ -148,32 +139,14 @@ |
49 |
@@ -147,35 +140,14 @@ |
52 |
install: all |
50 |
install: all |
53 |
-[ -d $(pp)$(libdir) ] || mkdir -p $(pp)$(libdir) |
51 |
-[ -d $(pp)$(libdir) ] || mkdir -p $(pp)$(libdir) |
54 |
-chmod 755 $(pp)$(libdir) |
52 |
-chmod 755 $(pp)$(libdir) |
Lines 56-62
Link Here
|
56 |
- -chmod 755 $(pp)$(libdir)/java |
54 |
- -chmod 755 $(pp)$(libdir)/java |
57 |
- -[ -d $(pp)$(libdir)/java/src ] || mkdir -p $(pp)$(libdir)/java/src |
55 |
- -[ -d $(pp)$(libdir)/java/src ] || mkdir -p $(pp)$(libdir)/java/src |
58 |
- -chmod 755 $(pp)$(libdir)/java/src |
56 |
- -chmod 755 $(pp)$(libdir)/java/src |
|
|
57 |
- -[ ! -d $(pp)$(libdir)/java/src/dklibsj ] || rm -fr $(pp)$(libdir)/java/src/dklibsj |
59 |
- -[ -d $(pp)$(libdir)/java/src/dklibsj ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj |
58 |
- -[ -d $(pp)$(libdir)/java/src/dklibsj ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj |
|
|
59 |
- -[ -d $(pp)$(libdir)/java/src/dklibsj/loc ] || mkdir -p $(pp)$(libdir)/java/src/dklibsj/loc |
60 |
- -chmod 755 $(pp)$(libdir)/java/src/dklibsj |
60 |
- -chmod 755 $(pp)$(libdir)/java/src/dklibsj |
61 |
- -[ -d $(pp)$(libdir)/java/doc ] || mkdir -p $(pp)$(libdir)/java/doc |
61 |
- -[ -d $(pp)$(libdir)/java/doc ] || mkdir -p $(pp)$(libdir)/java/doc |
62 |
- -chmod 755 $(pp)$(libdir)/java/doc |
62 |
- -chmod 755 $(pp)$(libdir)/java/doc |
Lines 74-79
Link Here
|
74 |
- -chmod 755 $(pp)$(datadir)/doc |
74 |
- -chmod 755 $(pp)$(datadir)/doc |
75 |
- -[ -d $(pp)$(datadir)/doc/javadoc ] || mkdir -p $(pp)$(datadir)/doc/javadoc |
75 |
- -[ -d $(pp)$(datadir)/doc/javadoc ] || mkdir -p $(pp)$(datadir)/doc/javadoc |
76 |
- -chmod 755 $(pp)$(datadir)/doc/javadoc |
76 |
- -chmod 755 $(pp)$(datadir)/doc/javadoc |
|
|
77 |
- -[ ! -d $(pp)$(datadir)/doc/javadoc/dklibsj ] || rm -fr $(pp)$(datadir)/doc/javadoc/dklibsj |
77 |
- -[ -d $(pp)$(datadir)/doc/javadoc/dklibsj ] || mkdir -p $(pp)$(datadir)/doc/javadoc/dklibsj |
78 |
- -[ -d $(pp)$(datadir)/doc/javadoc/dklibsj ] || mkdir -p $(pp)$(datadir)/doc/javadoc/dklibsj |
78 |
- -chmod 755 $(pp)$(datadir)/doc/javadoc/dklibsj |
79 |
- -chmod 755 $(pp)$(datadir)/doc/javadoc/dklibsj |
79 |
- -[ -d $(pp)$(datadir)/doc/javadoc/TraceGUI ] || mkdir -p $(pp)$(datadir)/doc/javadoc/TraceGUI |
80 |
- -[ -d $(pp)$(datadir)/doc/javadoc/TraceGUI ] || mkdir -p $(pp)$(datadir)/doc/javadoc/TraceGUI |
Lines 81-87
Link Here
|
81 |
chmod 644 *.so |
82 |
chmod 644 *.so |
82 |
tar cf - *.so | (cd $(pp)$(libdir) ; tar xf -) |
83 |
tar cf - *.so | (cd $(pp)$(libdir) ; tar xf -) |
83 |
-[ ! -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) ] || rm -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) |
84 |
-[ ! -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) ] || rm -f $(pp)$(libdir)/libdklatsup.so.$(SOVERS) |
84 |
@@ -196,39 +169,57 @@ |
85 |
@@ -198,39 +170,57 @@ |
85 |
-[ ! -f $(pp)$(libdir)/libdkfigw.so ] || rm -f $(pp)$(libdir)/libdkfigw.so |
86 |
-[ ! -f $(pp)$(libdir)/libdkfigw.so ] || rm -f $(pp)$(libdir)/libdkfigw.so |
86 |
cp libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so.$(SOVERS) |
87 |
cp libdklatsup.so.$(SOVERS) $(pp)$(libdir)/libdklatsup.so.$(SOVERS) |
87 |
( cd $(pp)$(libdir); ln -sf libdklatsup.so.$(SOVERS) libdklatsup.so ) |
88 |
( cd $(pp)$(libdir); ln -sf libdklatsup.so.$(SOVERS) libdklatsup.so ) |
Lines 139-145
Link Here
|
139 |
chmod 644 $(pp)$(libdir)/libdkfigw.so |
140 |
chmod 644 $(pp)$(libdir)/libdkfigw.so |
140 |
chmod 644 *.h |
141 |
chmod 644 *.h |
141 |
mv config.h config.h.do-not-install |
142 |
mv config.h config.h.do-not-install |
142 |
@@ -247,24 +238,12 @@ |
143 |
@@ -249,27 +239,12 @@ |
143 |
chmod 755 $(pp)$(bindir)/bifconf |
144 |
chmod 755 $(pp)$(bindir)/bifconf |
144 |
cp jhelp $(pp)$(bindir)/jhelp |
145 |
cp jhelp $(pp)$(bindir)/jhelp |
145 |
chmod 755 $(pp)$(bindir)/jhelp |
146 |
chmod 755 $(pp)$(bindir)/jhelp |
Lines 149-166
Link Here
|
149 |
- chmod 755 $(pp)$(bindir)/tracegui.jar |
150 |
- chmod 755 $(pp)$(bindir)/tracegui.jar |
150 |
- cp dklibsj.jar $(pp)$(bindir)/dklibsj.jar |
151 |
- cp dklibsj.jar $(pp)$(bindir)/dklibsj.jar |
151 |
- chmod 755 $(pp)$(bindir)/dklibsj.jar |
152 |
- chmod 755 $(pp)$(bindir)/dklibsj.jar |
|
|
153 |
- cp wdklibsj.jar $(pp)$(bindir)/wdklibsj.jar |
154 |
- chmod 755 $(pp)$(bindir)/wdklibsj.jar |
152 |
cp dkpref $(pp)$(bindir)/dkpref |
155 |
cp dkpref $(pp)$(bindir)/dkpref |
153 |
chmod 755 $(pp)$(bindir)/dkpref |
156 |
chmod 755 $(pp)$(bindir)/dkpref |
154 |
-cp appdefaults $(pp)$(scd)/appdefaults.sample |
157 |
-cp appdefaults $(pp)$(scd)/appdefaults.sample |
155 |
-[ -f $(pp)$(scd)/appdefaults ] || cp appdefaults $(pp)$(scd)/appdefaults |
158 |
-[ -f $(pp)$(scd)/appdefaults ] || cp appdefaults $(pp)$(scd)/appdefaults |
156 |
- -(cd man; tar cf - ./*) | (cd $(pp)$(mandir) ; tar xf -) |
159 |
- -(cd man; tar cf - ./*) | (cd $(pp)$(mandir) ; tar xf -) |
157 |
-(cd share; tar cf - ./*) | (cd $(pp)$(datadir) ; tar xf -) |
160 |
-(cd share; tar cf - ./*) | (cd $(pp)$(datadir) ; tar xf -) |
158 |
- -(cd Java/dklibsj/src; tar cf - ./dirk_krause) | (cd $(pp)$(libdir)/java/src/dklibsj; tar xf -) |
161 |
- -(cd Java/src; tar cf - ./dirk_krause) | (cd $(pp)$(libdir)/java/src/dklibsj; tar xf -) |
159 |
- -(cd Java/dklibsj/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/dklibsj && tar xf -) |
162 |
- -(cd Java/loc; tar cf - .) | (cd $(pp)$(libdir)/java/src/dklibsj/loc; tar xf -) |
160 |
- -(cd Java/TraceGUI/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/TraceGUI && tar xf -) |
163 |
- -(cd Java/doc; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc && tar xf -) |
|
|
164 |
- -(cd Java/doc/traceccgui; tar cf - .) | (cd $(pp)$(datadir)/doc/javadoc/TraceGUI && tar xf -) |
161 |
- -[ -d $(pp)$(libdir)/java/doc/dklibsj ] || ln -s $(pp)$(datadir)/doc/javadoc/dklibsj $(pp)$(libdir)/java/doc/dklibsj |
165 |
- -[ -d $(pp)$(libdir)/java/doc/dklibsj ] || ln -s $(pp)$(datadir)/doc/javadoc/dklibsj $(pp)$(libdir)/java/doc/dklibsj |
162 |
ldconfig |
166 |
ldconfig |
163 |
- echo Documentation was installed in $(pp)$(datadir)/doc/dklibs |
167 |
- echo Documentation was installed in $(pp)$(datadir)/doc/dklibs |
164 |
PORTOBJ1= dkslsupp.o dkma.o dksf.o dkstrdc.o dkstr.o dkenc.o |
168 |
PORTOBJ1= dkslsupp.o dkma.o dksf.o dkstrdc.o dkstr.o dkenc.o |
|
|
169 |
@@ -409,8 +384,4 @@ |
170 |
$(LINK) -o rwperlmk rwperlmk.o |
171 |
chmod 755 rwperlmk |
172 |
|
173 |
-java-progs: |
174 |
- cd Java && ./build |
175 |
- |
176 |
-VERSNUMB= -DVERSNUMB=\"1.26.0\" |
177 |
VERSNUMB= -DVERSNUMB=\"1.27.0\" |