| 1 |
bicatali 09/12/03 20:13:52 |
| 2 |
|
| 3 |
Modified: opendx-4.4.4-installpaths.patch |
| 4 |
Log: |
| 5 |
Revision bump for the install paths according to bug #295395. Thanks Francois Bissey to follow-up |
| 6 |
(Portage version: 2.2_rc54/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: opendx-4.4.4-installpaths.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- opendx-4.4.4-installpaths.patch 27 Nov 2009 18:17:00 -0000 1.1 |
| 22 |
+++ opendx-4.4.4-installpaths.patch 3 Dec 2009 20:13:52 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in |
| 25 |
--- dx-4.4.4/bin/dx.in.r 2004-05-31 18:12:05.000000000 +0200 |
| 26 |
-+++ dx-4.4.4/bin/dx.in 2009-11-06 11:47:32.190944177 +0100 |
| 27 |
++++ dx-4.4.4/bin/dx.in 2009-01-26 23:57:11.000000000 +0100 |
| 28 |
@@ -60,14 +60,7 @@ exit 1 |
| 29 |
# |
| 30 |
longhelp() { |
| 31 |
@@ -22,92 +22,22 @@ |
| 32 |
|
| 33 |
if [ -z "$DXROOT" ]; then |
| 34 |
- prefix=@prefix@ |
| 35 |
-+ prefix=@datadir@ |
| 36 |
++ prefix=@libdir@ |
| 37 |
DXROOT=$prefix/dx |
| 38 |
fi |
| 39 |
export DXROOT |
| 40 |
-@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then |
| 41 |
- fi |
| 42 |
- fi |
| 43 |
- |
| 44 |
-+if [ -z "$DXFONTS" ]; then |
| 45 |
-+ DXFONTS=$DXROOT/fonts |
| 46 |
-+ if [ -d "$DXFONTS" ]; then |
| 47 |
-+ export DXFONTS |
| 48 |
-+ fi |
| 49 |
-+fi |
| 50 |
-+ |
| 51 |
- # if DXMACROS not set, default it to the usual unless dir doesn't exist |
| 52 |
- if [ -z "$DXMACROS" ]; then |
| 53 |
- DXMACROS=$DXROOT/samples/macros |
| 54 |
@@ -507,7 +507,7 @@ export DXARCH |
| 55 |
|
| 56 |
# default to running locally, from @prefix@/dx |
| 57 |
exhost=$thishost |
| 58 |
-dxroot=@prefix@/dx |
| 59 |
-+dxroot=@datadir@/dx |
| 60 |
++dxroot=@libdir@/dx |
| 61 |
startup=1 # run the startup window by default |
| 62 |
|
| 63 |
|
| 64 |
-@@ -1469,8 +1469,8 @@ done |
| 65 |
- |
| 66 |
- # Now set some needed results |
| 67 |
- |
| 68 |
--dxexroot=$dxroot |
| 69 |
--dxuiroot=$dxroot |
| 70 |
-+dxexroot=@libdir@/dx |
| 71 |
-+dxuiroot=@libdir@/dx |
| 72 |
- dxexecdef="$dxexroot/bin_${exarch}/dxexec" |
| 73 |
- if test -z "$dxexec" ; then |
| 74 |
- dxexec=$dxexecdef |
| 75 |
-@@ -1600,7 +1600,7 @@ fi |
| 76 |
- # |
| 77 |
- if test $tutor -eq 1 ; then |
| 78 |
- |
| 79 |
-- cmd="$DXROOT/bin_${uiarch}/tutor" |
| 80 |
-+ cmd="$DXEXECROOT/bin_${uiarch}/tutor" |
| 81 |
- if test $seecomline -eq 1 ; then |
| 82 |
- set |
| 83 |
- echo "$echoparms exec $cmd $xparms" |
| 84 |
-@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then |
| 85 |
- prompterflags="$prompterflags -file \"$FileName\"" |
| 86 |
- fi |
| 87 |
- |
| 88 |
-- cmd="$DXROOT/bin_${uiarch}/prompter" |
| 89 |
-+ cmd="$DXEXECROOT/bin_${uiarch}/prompter" |
| 90 |
- if test $seecomline -eq 1 ; then |
| 91 |
- set |
| 92 |
- echo "$echoparms exec $cmd $prompterflags $xparms" |
| 93 |
-@@ -1635,7 +1635,7 @@ fi |
| 94 |
- if test $startup -eq 1 ; then |
| 95 |
- |
| 96 |
- |
| 97 |
-- cmd="$DXROOT/bin_${uiarch}/startupui" |
| 98 |
-+ cmd="$DXEXECROOT/bin_${uiarch}/startupui" |
| 99 |
- if test $seecomline -eq 1 ; then |
| 100 |
- set |
| 101 |
- echo "$echoparms exec $cmd $xparms $*" |
| 102 |
-@@ -1649,7 +1649,7 @@ fi |
| 103 |
- # |
| 104 |
- if test $builder -eq 1 ; then |
| 105 |
- |
| 106 |
-- cmd="$DXROOT/bin_${uiarch}/builder" |
| 107 |
-+ cmd="$DXEXECROOT/bin_${uiarch}/builder" |
| 108 |
- if test $seecomline -eq 1 ; then |
| 109 |
- set |
| 110 |
- echo "exec $cmd $xparms $motifcmd $motifbind $FileName" |
| 111 |
-@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then |
| 112 |
- EncodedBase="${Base}-e" |
| 113 |
- |
| 114 |
- echo "Creating encoded version of $FileName in ${EncodedBase}.net " |
| 115 |
-- cmd1="$DXROOT/bin_${uiarch}/dxencode" |
| 116 |
-+ cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" |
| 117 |
- if test -f $CfgName ; then |
| 118 |
- echo "Copying $CfgName to ${EncodedBase}.cfg" |
| 119 |
- cmd2="cp $CfgName ${EncodedBase}.cfg" |
| 120 |
diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am |
| 121 |
--- dx-4.4.4/bin/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 |
| 122 |
-+++ dx-4.4.4/bin/Makefile.am 2009-11-06 11:47:32.192943219 +0100 |
| 123 |
++++ dx-4.4.4/bin/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 124 |
@@ -1,6 +1,6 @@ |
| 125 |
## Process this file with automake to produce Makefile.in |
| 126 |
|
| 127 |
@@ -118,18 +48,18 @@ |
| 128 |
EXTRA_SCRIPTS = mdf2c dx |
| 129 |
diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in |
| 130 |
--- dx-4.4.4/bin/mdf2c.in.r 1999-12-14 05:13:04.000000000 +0100 |
| 131 |
-+++ dx-4.4.4/bin/mdf2c.in 2009-11-06 11:47:32.194943239 +0100 |
| 132 |
++++ dx-4.4.4/bin/mdf2c.in 2009-01-26 23:57:11.000000000 +0100 |
| 133 |
@@ -1,6 +1,6 @@ |
| 134 |
#!/bin/sh |
| 135 |
# Configure is looking for the following line |
| 136 |
-prefix=@prefix@ |
| 137 |
-+prefix=@datadir@ |
| 138 |
++prefix=@libdir@ |
| 139 |
DFLTROOT=$prefix/dx |
| 140 |
root=${DXROOT=${DXEXECROOT=$DFLTROOT}} |
| 141 |
|
| 142 |
diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am |
| 143 |
--- dx-4.4.4/doc/Makefile.am.r 1999-04-05 13:57:03.000000000 +0200 |
| 144 |
-+++ dx-4.4.4/doc/Makefile.am 2009-11-06 11:47:32.203697175 +0100 |
| 145 |
++++ dx-4.4.4/doc/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 146 |
@@ -1,6 +1,6 @@ |
| 147 |
## Process this file with automake to produce Makefile.in |
| 148 |
|
| 149 |
@@ -140,76 +70,59 @@ |
| 150 |
README README_SMP README_alphax README_aviion README_hp700 \ |
| 151 |
diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am |
| 152 |
--- dx-4.4.4/fonts/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 |
| 153 |
-+++ dx-4.4.4/fonts/Makefile.am 2009-11-06 11:47:32.204697430 +0100 |
| 154 |
++++ dx-4.4.4/fonts/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 155 |
@@ -1,6 +1,6 @@ |
| 156 |
## Process this file with automake to produce Makefile.in |
| 157 |
|
| 158 |
-fontdir = $(prefix)/dx/fonts |
| 159 |
-+fontdir = $(datadir)/dx/fonts |
| 160 |
++fontdir = $(libdir)/dx/fonts |
| 161 |
|
| 162 |
font_DATA = \ |
| 163 |
README area.dx cyril_d.dx \ |
| 164 |
diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am |
| 165 |
--- dx-4.4.4/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 |
| 166 |
-+++ dx-4.4.4/help/Makefile.am 2009-11-06 11:47:32.206696961 +0100 |
| 167 |
++++ dx-4.4.4/help/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 168 |
@@ -1,6 +1,6 @@ |
| 169 |
## Process this file with automake to produce Makefile.in |
| 170 |
|
| 171 |
-helpdir = $(prefix)/dx/help |
| 172 |
-+helpdir = $(datadir)/dx/help |
| 173 |
++helpdir = $(libdir)/dx/help |
| 174 |
|
| 175 |
EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ |
| 176 |
$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ |
| 177 |
-@@ -257,7 +257,7 @@ install-data-hook: |
| 178 |
- $(LN_S) hlpalhtl svsmstrh ; \ |
| 179 |
- $(LN_S) hlpalhtl ugidx ; \ |
| 180 |
- $(LN_S) hlpalhtl usrefidx ; \ |
| 181 |
-- $(LN_S) HelpDir GarHelpDir ; \ |
| 182 |
-+ $(LN_S) HelpDir GARHelpDir ; \ |
| 183 |
- $(LN_S) HelpDir MBHelpDir ; \ |
| 184 |
- echo "cd $(DESTDIR)$(helpdir)" ; \ |
| 185 |
- echo "$(LN_S) hlpalhtl mbidx" ; \ |
| 186 |
-@@ -265,6 +265,6 @@ install-data-hook: |
| 187 |
- echo "$(LN_S) hlpalhtl svsmstrh" ; \ |
| 188 |
- echo "$(LN_S) hlpalhtl ugidx" ; \ |
| 189 |
- echo "$(LN_S) hlpalhtl usrefidx" ; \ |
| 190 |
-- echo "$(LN_S) HelpDir GarHelpDir" ; \ |
| 191 |
-+ echo "$(LN_S) HelpDir GARHelpDir" ; \ |
| 192 |
- echo "$(LN_S) HelpDir MBHelpDir" ) \ |
| 193 |
- ' |
| 194 |
diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am |
| 195 |
--- dx-4.4.4/html/images/Makefile.am.r 2002-04-01 10:51:13.000000000 +0200 |
| 196 |
-+++ dx-4.4.4/html/images/Makefile.am 2009-11-06 11:47:32.214944415 +0100 |
| 197 |
++++ dx-4.4.4/html/images/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 198 |
@@ -1,5 +1,5 @@ |
| 199 |
|
| 200 |
-imagesdir = $(prefix)/dx/html/images |
| 201 |
-+imagesdir = $(datadir)/dx/html/images |
| 202 |
++imagesdir = $(libdir)/dx/html/images |
| 203 |
|
| 204 |
images1 = \ |
| 205 |
3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ |
| 206 |
diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am |
| 207 |
--- dx-4.4.4/html/Makefile.am.r 2003-07-12 02:11:39.000000000 +0200 |
| 208 |
-+++ dx-4.4.4/html/Makefile.am 2009-11-06 11:47:32.216944434 +0100 |
| 209 |
++++ dx-4.4.4/html/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 210 |
@@ -1,6 +1,6 @@ |
| 211 |
## Process this file with automake to produce Makefile.in |
| 212 |
|
| 213 |
-htmldir = $(prefix)/dx/html |
| 214 |
-+htmldir = $(datadir)/dx/html |
| 215 |
++htmldir = $(libdir)/dx/html |
| 216 |
|
| 217 |
SUBDIRS = pages images |
| 218 |
|
| 219 |
diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am |
| 220 |
--- dx-4.4.4/html/pages/Makefile.am.r 2002-06-20 06:38:03.000000000 +0200 |
| 221 |
-+++ dx-4.4.4/html/pages/Makefile.am 2009-11-06 11:47:32.217945666 +0100 |
| 222 |
++++ dx-4.4.4/html/pages/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 223 |
@@ -1,4 +1,4 @@ |
| 224 |
-pagesdir = $(prefix)/dx/html/pages |
| 225 |
-+pagesdir = $(datadir)/dx/html/pages |
| 226 |
++pagesdir = $(libdir)/dx/html/pages |
| 227 |
|
| 228 |
pages1 = \ |
| 229 |
insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ |
| 230 |
diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am |
| 231 |
--- dx-4.4.4/include/dx/Makefile.am.r 1999-05-26 01:35:16.000000000 +0200 |
| 232 |
-+++ dx-4.4.4/include/dx/Makefile.am 2009-11-06 11:47:32.222944494 +0100 |
| 233 |
++++ dx-4.4.4/include/dx/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 234 |
@@ -1,6 +1,6 @@ |
| 235 |
## Process this file with automake to produce Makefile.in |
| 236 |
|
| 237 |
@@ -220,7 +133,7 @@ |
| 238 |
UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ |
| 239 |
diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am |
| 240 |
--- dx-4.4.4/include/Makefile.am.r 2006-04-09 05:44:49.000000000 +0200 |
| 241 |
-+++ dx-4.4.4/include/Makefile.am 2009-11-06 11:47:32.224942558 +0100 |
| 242 |
++++ dx-4.4.4/include/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 243 |
@@ -1,4 +1,4 @@ |
| 244 |
-dxincdir = $(prefix)/dx/include |
| 245 |
+dxincdir = $(prefix)/include |
| 246 |
@@ -229,16 +142,16 @@ |
| 247 |
nodist_dxinc_HEADERS = dxconfig.h |
| 248 |
diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am |
| 249 |
--- dx-4.4.4/lib/Makefile.am.r 2003-08-22 01:22:13.000000000 +0200 |
| 250 |
-+++ dx-4.4.4/lib/Makefile.am 2009-11-06 11:47:32.225944279 +0100 |
| 251 |
++++ dx-4.4.4/lib/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 252 |
@@ -1,4 +1,4 @@ |
| 253 |
-libsdir = $(prefix)/dx/lib |
| 254 |
-+libsdir = $(datadir)/dx/lib |
| 255 |
++libsdir = $(libdir)/dx/lib |
| 256 |
|
| 257 |
libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \ |
| 258 |
dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c |
| 259 |
diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am |
| 260 |
--- dx-4.4.4/man/Makefile.am.r 1999-04-03 18:31:28.000000000 +0200 |
| 261 |
-+++ dx-4.4.4/man/Makefile.am 2009-11-06 11:47:32.227944298 +0100 |
| 262 |
++++ dx-4.4.4/man/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 263 |
@@ -1,4 +1,4 @@ |
| 264 |
## Process this file with automake to produce Makefile.in |
| 265 |
|
| 266 |
@@ -247,7 +160,7 @@ |
| 267 |
|
| 268 |
diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am |
| 269 |
--- dx-4.4.4/man/manl/Makefile.am.r 2002-05-20 06:47:06.000000000 +0200 |
| 270 |
-+++ dx-4.4.4/man/manl/Makefile.am 2009-11-06 11:47:32.228944553 +0100 |
| 271 |
++++ dx-4.4.4/man/manl/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 272 |
@@ -1,6 +1,6 @@ |
| 273 |
## Process this file with automake to produce Makefile.in |
| 274 |
|
| 275 |
@@ -258,7 +171,7 @@ |
| 276 |
EXTRA_DIST = $(man_MANS) |
| 277 |
diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am |
| 278 |
--- dx-4.4.4/src/exec/dxexec/Makefile.am.r 2006-01-11 17:24:39.000000000 +0100 |
| 279 |
-+++ dx-4.4.4/src/exec/dxexec/Makefile.am 2009-11-06 11:47:32.229944807 +0100 |
| 280 |
++++ dx-4.4.4/src/exec/dxexec/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 281 |
@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la |
| 282 |
libDXEXEC_la_SOURCES = main.c |
| 283 |
libDXEXEC_la_CFLAGS = $(AM_CFLAGS) |
| 284 |
@@ -292,7 +205,7 @@ |
| 285 |
HEADERS1 = \ |
| 286 |
diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am |
| 287 |
--- dx-4.4.4/src/exec/libdx/Makefile.am.r 2006-03-27 20:56:53.000000000 +0200 |
| 288 |
-+++ dx-4.4.4/src/exec/libdx/Makefile.am 2009-11-06 11:47:32.234939235 +0100 |
| 289 |
++++ dx-4.4.4/src/exec/libdx/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 290 |
@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ |
| 291 |
#INCLUDES = -I../../../include -D@ARCH@ |
| 292 |
INCLUDES = -I${top_srcdir}/include -D@ARCH@ |
| 293 |
@@ -304,7 +217,7 @@ |
| 294 |
#dxlib_LIBRARIES = libDXlite.a |
| 295 |
diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am |
| 296 |
--- dx-4.4.4/src/exec/Makefile.am.r 2003-09-17 00:40:40.000000000 +0200 |
| 297 |
-+++ dx-4.4.4/src/exec/Makefile.am 2009-11-06 11:47:32.236940232 +0100 |
| 298 |
++++ dx-4.4.4/src/exec/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 299 |
@@ -1,6 +1,6 @@ |
| 300 |
SUBDIRS = libdx dxmods hwrender dpexec dxexec |
| 301 |
|
| 302 |
@@ -315,7 +228,7 @@ |
| 303 |
MINOR_VERSION=@MINOR_VERSION@ |
| 304 |
diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am |
| 305 |
--- dx-4.4.4/src/misc/Makefile.am.r 2003-07-12 02:12:13.000000000 +0200 |
| 306 |
-+++ dx-4.4.4/src/misc/Makefile.am 2009-11-06 11:47:32.236940232 +0100 |
| 307 |
++++ dx-4.4.4/src/misc/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 308 |
@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR |
| 309 |
|
| 310 |
dxbindir = $(prefix)/bin |
| 311 |
@@ -334,7 +247,7 @@ |
| 312 |
fi |
| 313 |
diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am |
| 314 |
--- dx-4.4.4/src/uipp/dxl/Makefile.am.r 2003-07-12 02:12:16.000000000 +0200 |
| 315 |
-+++ dx-4.4.4/src/uipp/dxl/Makefile.am 2009-11-06 11:47:32.236940232 +0100 |
| 316 |
++++ dx-4.4.4/src/uipp/dxl/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 317 |
@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ |
| 318 |
|
| 319 |
INCLUDES = -I${top_srcdir}/include -D@ARCH@ |
| 320 |
@@ -346,7 +259,7 @@ |
| 321 |
dxlP.h \ |
| 322 |
diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am |
| 323 |
--- dx-4.4.4/src/uipp/dxui/Makefile.am.r 2003-07-12 02:12:17.000000000 +0200 |
| 324 |
-+++ dx-4.4.4/src/uipp/dxui/Makefile.am 2009-11-06 11:47:32.237940486 +0100 |
| 325 |
++++ dx-4.4.4/src/uipp/dxui/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 326 |
@@ -2,7 +2,7 @@ |
| 327 |
|
| 328 |
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ |
| 329 |
@@ -356,52 +269,9 @@ |
| 330 |
dxbin_PROGRAMS = dxui |
| 331 |
|
| 332 |
|
| 333 |
-diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am |
| 334 |
---- dx-4.4.4/src/uipp/java/Makefile.am.r 2006-03-27 20:06:09.000000000 +0200 |
| 335 |
-+++ dx-4.4.4/src/uipp/java/Makefile.am 2009-11-06 11:47:32.238939763 +0100 |
| 336 |
-@@ -27,12 +27,12 @@ |
| 337 |
- ## libtool and the -shrext flag to make this much more |
| 338 |
- ## portable. |
| 339 |
- |
| 340 |
--javadxdir = $(prefix)/dx/java/htmlpages |
| 341 |
-+javadxdir = $(libdir)/dx/java/htmlpages |
| 342 |
- javadx_DATA = dx.jar |
| 343 |
--javasrvdir = $(prefix)/dx/java/server/class |
| 344 |
-+javasrvdir = $(libdir)/dx/java/server/class |
| 345 |
- javasrv_DATA = server.jar |
| 346 |
- EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README |
| 347 |
--javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ |
| 348 |
-+javalibdir = $(libdir)/dx/java/server/lib_@ARCH@ |
| 349 |
- |
| 350 |
- javalib_DATA = @ANYDX@ |
| 351 |
- SUBDIRS = server dx layout |
| 352 |
-diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am |
| 353 |
---- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r 1999-07-09 21:25:13.000000000 +0200 |
| 354 |
-+++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am 2009-11-06 11:47:32.238939763 +0100 |
| 355 |
-@@ -1,6 +1,6 @@ |
| 356 |
- ## Process this file with automake to produce Makefile.in |
| 357 |
- |
| 358 |
--serverdatadir = $(prefix)/dx/java/server/dxmacros |
| 359 |
-+serverdatadir = $(libdir)/dx/java/server/dxmacros |
| 360 |
- |
| 361 |
- serverdata_DATA = $(MACRO_FILES) |
| 362 |
- |
| 363 |
-diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am |
| 364 |
---- dx-4.4.4/src/uipp/java/server/Makefile.am.r 2001-05-21 16:47:39.000000000 +0200 |
| 365 |
-+++ dx-4.4.4/src/uipp/java/server/Makefile.am 2009-11-06 11:47:32.238939763 +0100 |
| 366 |
-@@ -1,6 +1,6 @@ |
| 367 |
--srvbindir = $(prefix)/dx/java/server/bin |
| 368 |
--srvoutputdir = $(prefix)/dx/java/output |
| 369 |
--userhtmldir = $(prefix)/dx/java/user |
| 370 |
-+srvbindir = $(libdir)/dx/java/server/bin |
| 371 |
-+srvoutputdir = $(libdir)/dx/java/output |
| 372 |
-+userhtmldir = $(libdir)/dx/java/user |
| 373 |
- # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes |
| 374 |
- # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files |
| 375 |
- srvrundir = $(srvbindir)/../class |
| 376 |
diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am |
| 377 |
--- dx-4.4.4/src/uipp/mb/Makefile.am.r 2003-08-20 16:21:33.000000000 +0200 |
| 378 |
-+++ dx-4.4.4/src/uipp/mb/Makefile.am 2009-11-06 11:47:32.239939528 +0100 |
| 379 |
++++ dx-4.4.4/src/uipp/mb/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 380 |
@@ -2,7 +2,7 @@ |
| 381 |
|
| 382 |
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ |
| 383 |
@@ -413,7 +283,7 @@ |
| 384 |
|
| 385 |
diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am |
| 386 |
--- dx-4.4.4/src/uipp/prompter/Makefile.am.r 2003-11-04 05:20:14.000000000 +0100 |
| 387 |
-+++ dx-4.4.4/src/uipp/prompter/Makefile.am 2009-11-06 11:47:32.239939528 +0100 |
| 388 |
++++ dx-4.4.4/src/uipp/prompter/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 389 |
@@ -2,7 +2,7 @@ |
| 390 |
|
| 391 |
INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ |
| 392 |
@@ -425,7 +295,7 @@ |
| 393 |
|
| 394 |
diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am |
| 395 |
--- dx-4.4.4/src/uipp/startup/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 |
| 396 |
-+++ dx-4.4.4/src/uipp/startup/Makefile.am 2009-11-06 11:47:32.240940272 +0100 |
| 397 |
++++ dx-4.4.4/src/uipp/startup/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 398 |
@@ -2,7 +2,7 @@ |
| 399 |
|
| 400 |
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ |
| 401 |
@@ -437,7 +307,7 @@ |
| 402 |
|
| 403 |
diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am |
| 404 |
--- dx-4.4.4/src/uipp/tutor/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 |
| 405 |
-+++ dx-4.4.4/src/uipp/tutor/Makefile.am 2009-11-06 11:47:32.240940272 +0100 |
| 406 |
++++ dx-4.4.4/src/uipp/tutor/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 407 |
@@ -2,7 +2,7 @@ |
| 408 |
|
| 409 |
INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ |
| 410 |
@@ -449,12 +319,12 @@ |
| 411 |
|
| 412 |
diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am |
| 413 |
--- dx-4.4.4/src/uipp/ui/Makefile.am.r 2001-04-12 16:29:02.000000000 +0200 |
| 414 |
-+++ dx-4.4.4/src/uipp/ui/Makefile.am 2009-11-06 11:47:32.240940272 +0100 |
| 415 |
++++ dx-4.4.4/src/uipp/ui/Makefile.am 2009-01-26 23:57:11.000000000 +0100 |
| 416 |
@@ -1,6 +1,6 @@ |
| 417 |
## Process this file with automake to produce Makefile.in |
| 418 |
|
| 419 |
-uidatadir = $(prefix)/dx/ui |
| 420 |
-+uidatadir = $(datadir)/dx/ui |
| 421 |
++uidatadir = $(libdir)/dx/ui |
| 422 |
|
| 423 |
DATA1 = \ |
| 424 |
icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \ |
Archives