| 1 |
patrick 09/04/23 19:13:39 |
| 2 |
|
| 3 |
Added: gambas-2.9.0-component.am.patch |
| 4 |
svn-r1636-xdg-utils.patch |
| 5 |
gambas-2.9.0-examples_Makefile.am.patch |
| 6 |
gambas-2.9.0-app_Makefile.am.patch |
| 7 |
gambas-2.9.0-help_Makefile.am.patch |
| 8 |
gambas-2.9.0-main_Makefile.am.patch |
| 9 |
gambas-2.9.0-comp_Makefile.am.patch |
| 10 |
Log: |
| 11 |
Bump to 2.11.1. Thanks to Lars Wendler and Boian Berberov for the ebuilds and patches. Fixes #249339 |
| 12 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 dev-util/gambas/files/gambas-2.9.0-component.am.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-component.am.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-component.am.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: gambas-2.9.0-component.am.patch |
| 21 |
=================================================================== |
| 22 |
--- component.am.orig 2008-11-03 |
| 23 |
+++ component.am 2008-11-03 |
| 24 |
@@ -2,22 +2,25 @@ |
| 25 |
gblib_DATA = $(COMPONENT).component |
| 26 |
|
| 27 |
install-data-hook: |
| 28 |
- @$(INSTALL) -d $(DESTDIR)$(gbdatadir)/info |
| 29 |
+ @echo; \ |
| 30 |
+ $(INSTALL) -d $(DESTDIR)$(gbdatadir)/info |
| 31 |
+ |
| 32 |
@if test -d $(COMPONENT); then \ |
| 33 |
- echo "Compiling the $(COMPONENT) project..."; \ |
| 34 |
( \ |
| 35 |
+ echo "Creating the information files for $(COMPONENT) component ..."; \ |
| 36 |
$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ |
| 37 |
+ echo -n "Compiling the $(COMPONENT) project ... "; \ |
| 38 |
cd $(COMPONENT); \ |
| 39 |
- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ |
| 40 |
+ $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix) && \ |
| 41 |
$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 42 |
rm -rf .gambas; \ |
| 43 |
$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ |
| 44 |
) \ |
| 45 |
fi |
| 46 |
- @echo |
| 47 |
- @echo "Creating the information files for $(COMPONENT) component..." |
| 48 |
- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) |
| 49 |
- @echo |
| 50 |
+ |
| 51 |
+ @echo "Creating the information files for $(COMPONENT) component ..."; \ |
| 52 |
+ $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ |
| 53 |
+ echo |
| 54 |
|
| 55 |
uninstall-hook: |
| 56 |
@if test -d $(COMPONENT); then \ |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 dev-util/gambas/files/svn-r1636-xdg-utils.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/svn-r1636-xdg-utils.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/svn-r1636-xdg-utils.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: svn-r1636-xdg-utils.patch |
| 66 |
=================================================================== |
| 67 |
--- app/configure.ac.orig 2008-10-05 |
| 68 |
+++ app/configure.ac 2008-10-05 |
| 69 |
@@ -7,7 +7,16 @@ |
| 70 |
|
| 71 |
dnl ---- Check for Portland scripts |
| 72 |
|
| 73 |
-AC_CHECK_PROGS(XDG_UTILS, [xdg-mime xdg-icon-resource], []) |
| 74 |
+AC_ARG_WITH([xdg-utils], |
| 75 |
+ [AC_HELP_STRING([--with-xdg-utils],[use xdg-utils to install icons and mimetypes (default; yes)])], |
| 76 |
+ [],[with_xdg_utils=yes]) |
| 77 |
+ |
| 78 |
+if test "x$with_xdg_utils" = "xno" |
| 79 |
+then |
| 80 |
+ AC_SUBST(XDG_UTILS, [""]) |
| 81 |
+else |
| 82 |
+ AC_CHECK_PROGS(XDG_UTILS, [xdg-mime xdg-icon-resource], []) |
| 83 |
+fi |
| 84 |
|
| 85 |
dnl ---- Create makefiles |
| 86 |
|
| 87 |
--- main/configure.ac.orig 2008-10-05 |
| 88 |
+++ main/configure.ac 2008-10-05 |
| 89 |
@@ -86,7 +86,16 @@ |
| 90 |
|
| 91 |
dnl ---- Check for Portland scripts |
| 92 |
|
| 93 |
-AC_CHECK_PROGS(XDG_UTILS, [xdg-mime xdg-icon-resource], []) |
| 94 |
+AC_ARG_WITH([xdg-utils], |
| 95 |
+ [AC_HELP_STRING([--with-xdg-utils],[use xdg-utils to install icons and mimetypes (default; yes)])], |
| 96 |
+ [],[with_xdg_utils=yes]) |
| 97 |
+ |
| 98 |
+if test "x$with_xdg_utils" = "xno" |
| 99 |
+then |
| 100 |
+ AC_SUBST(XDG_UTILS, [""]) |
| 101 |
+else |
| 102 |
+ AC_CHECK_PROGS(XDG_UTILS, [xdg-mime xdg-icon-resource], []) |
| 103 |
+fi |
| 104 |
|
| 105 |
dnl ---- Other options |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.1 dev-util/gambas/files/gambas-2.9.0-examples_Makefile.am.patch |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-examples_Makefile.am.patch?rev=1.1&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-examples_Makefile.am.patch?rev=1.1&content-type=text/plain |
| 114 |
|
| 115 |
Index: gambas-2.9.0-examples_Makefile.am.patch |
| 116 |
=================================================================== |
| 117 |
--- examples/Makefile.am.orig 2008-11-01 |
| 118 |
+++ examples/Makefile.am 2008-11-01 |
| 119 |
@@ -3,27 +3,35 @@ |
| 120 |
EXTRA_DIST = reconf examples spec |
| 121 |
|
| 122 |
install-exec-local: |
| 123 |
- @if test "x$(ROOT)" != "x"; then \ |
| 124 |
- echo "Installing with ROOT=$(ROOT)"; \ |
| 125 |
- echo; \ |
| 126 |
- fi |
| 127 |
- |
| 128 |
- @if test "x$(DESTDIR)" != "x"; then \ |
| 129 |
- echo "Installing with DESTDIR=$(DESTDIR)"; \ |
| 130 |
- echo; \ |
| 131 |
- ROOT=$DESTDIR; \ |
| 132 |
- fi |
| 133 |
+ @echo "=== Installing the gambas examples ==="; \ |
| 134 |
+ echo |
| 135 |
|
| 136 |
- @echo |
| 137 |
- @echo "Installing the gambas examples..." |
| 138 |
- @rm -rf $(DESTDIR)$(gbdatadir)/examples |
| 139 |
- @$(INSTALL) -d $(DESTDIR)$(gbdatadir)/examples |
| 140 |
- @cp -R $(srcdir)/examples $(DESTDIR)$(gbdatadir) |
| 141 |
- @(cd $(DESTDIR)$(gbdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \ |
| 142 |
- if test -e .project; then \ |
| 143 |
- echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 144 |
- fi \ |
| 145 |
- done) |
| 146 |
+ @if test -n "$(ROOT)"; then \ |
| 147 |
+ echo "Installing with ROOT=$(ROOT)"; \ |
| 148 |
+ fi; \ |
| 149 |
+ if test -n "$(DESTDIR)"; then \ |
| 150 |
+ echo "Installing with DESTDIR=$(DESTDIR)"; \ |
| 151 |
+ ROOT=$DESTDIR; \ |
| 152 |
+ fi; \ |
| 153 |
+ echo |
| 154 |
+ |
| 155 |
+ @(cd $(srcdir)/examples; \ |
| 156 |
+ for p in */ */*/; do \ |
| 157 |
+ if test -e $(abs_srcdir)/examples/$$p/.project; then \ |
| 158 |
+ cd $(abs_srcdir)/examples/$$p; \ |
| 159 |
+ echo -n "Compiling $$p... "; \ |
| 160 |
+ if $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); then \ |
| 161 |
+ $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 162 |
+ fi \ |
| 163 |
+ fi \ |
| 164 |
+ done); \ |
| 165 |
+ echo |
| 166 |
+ |
| 167 |
+ @echo "Installing the gambas examples"; \ |
| 168 |
+ rm -rf $(DESTDIR)$(gbdatadir)/examples; \ |
| 169 |
+ $(INSTALL) -d $(DESTDIR)$(gbdatadir)/examples; \ |
| 170 |
+ cp -R $(srcdir)/examples $(DESTDIR)$(gbdatadir); \ |
| 171 |
+ echo |
| 172 |
|
| 173 |
uninstall-local: |
| 174 |
@rm -rf $(DESTDIR)$(gbdatadir)/examples |
| 175 |
|
| 176 |
|
| 177 |
|
| 178 |
1.1 dev-util/gambas/files/gambas-2.9.0-app_Makefile.am.patch |
| 179 |
|
| 180 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-app_Makefile.am.patch?rev=1.1&view=markup |
| 181 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-app_Makefile.am.patch?rev=1.1&content-type=text/plain |
| 182 |
|
| 183 |
Index: gambas-2.9.0-app_Makefile.am.patch |
| 184 |
=================================================================== |
| 185 |
--- app/Makefile.am.orig 2008-12-15 |
| 186 |
+++ app/Makefile.am 2008-12-15 |
| 187 |
@@ -1,36 +1,54 @@ |
| 188 |
EXTRA_DIST = reconf src spec mime |
| 189 |
|
| 190 |
install-exec-local: |
| 191 |
- @echo "Installing the development environment..." |
| 192 |
- @(cd $(srcdir)/src; d=`pwd`; \ |
| 193 |
- for p in `cat INSTALL`; do \ |
| 194 |
- echo "Compiling $$p..."; cd $$d/$$p; \ |
| 195 |
- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ |
| 196 |
- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 197 |
- rm -rf .gambas; \ |
| 198 |
- $(INSTALL) $$p.gambas $(DESTDIR)$(bindir); \ |
| 199 |
- done) |
| 200 |
- ##@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then |
| 201 |
- @ln -s gambas$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION) || true |
| 202 |
- |
| 203 |
- @echo "Installing the scripter..." |
| 204 |
- @ln -s gbs$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION) || true |
| 205 |
- @ln -s gbw$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION) || true |
| 206 |
- @if test x"$(XDG_UTILS)" != x; then \ |
| 207 |
+ @echo "=== Installing the development environment ==="; \ |
| 208 |
+ echo |
| 209 |
+ |
| 210 |
+ @(for p in `cat $(srcdir)/src/INSTALL`; do \ |
| 211 |
+ echo -n "Compiling $$p ... "; \ |
| 212 |
+ cd $(abs_srcdir)/src/$$p; \ |
| 213 |
+ if $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); then \ |
| 214 |
+ $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 215 |
+ echo "Installing $$p"; \ |
| 216 |
+ rm -rf .gambas; \ |
| 217 |
+ $(INSTALL) $$p.gambas $(DESTDIR)$(bindir); \ |
| 218 |
+ fi \ |
| 219 |
+ done); \ |
| 220 |
+ echo |
| 221 |
+ |
| 222 |
+ @if test -e $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION).gambas; then \ |
| 223 |
+ echo "Creating IDE symbolic link"; \ |
| 224 |
+ $(LN_S) gambas$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION); \ |
| 225 |
+ fi; \ |
| 226 |
+ if test -e $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION)-database-manager.gambas; then \ |
| 227 |
+ echo "Creating Database Manager symbolic link"; \ |
| 228 |
+ $(LN_S) gambas$(GAMBAS_VERSION)-database-manager.gambas $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION)-database-manager; \ |
| 229 |
+ fi; \ |
| 230 |
+ if test -e $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION).gambas; then \ |
| 231 |
+ echo "Creating scripter symbolic links"; \ |
| 232 |
+ $(LN_S) gbs$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION); \ |
| 233 |
+ $(LN_S) gbs$(GAMBAS_VERSION).gambas $(DESTDIR)$(bindir)/gbw$(GAMBAS_VERSION); \ |
| 234 |
+ fi; \ |
| 235 |
+ echo |
| 236 |
+ |
| 237 |
+ @if test -n "$(XDG_UTILS)"; then \ |
| 238 |
$(INSTALL) -d $(DESTDIR)$(gbdatadir)/icons; \ |
| 239 |
- cp -f $(srcdir)/mime/application-x-gambas*.png $(DESTDIR)$(gbdatadir)/icons; \ |
| 240 |
+ $(INSTALL) -c -m 644 $(srcdir)/mime/application-x-gambas*.png $(DESTDIR)$(gbdatadir)/icons; \ |
| 241 |
echo "Registering Gambas script mimetype"; \ |
| 242 |
xdg-icon-resource install --context mimetypes --size 64 $(DESTDIR)$(gbdatadir)/icons/application-x-gambasscript.png application-x-gambasscript; \ |
| 243 |
xdg-mime install $(srcdir)/mime/application-x-gambasscript.xml; \ |
| 244 |
echo "Registering Gambas server page mimetype"; \ |
| 245 |
xdg-icon-resource install --context mimetypes --size 64 $(DESTDIR)$(gbdatadir)/icons/application-x-gambasserverpage.png application-x-gambasserverpage; \ |
| 246 |
xdg-mime install $(srcdir)/mime/application-x-gambasserverpage.xml; \ |
| 247 |
+ echo; \ |
| 248 |
fi |
| 249 |
|
| 250 |
uninstall-local: |
| 251 |
@rm -f $(DESTDIR)$(bindir)/gambas$(GAMBAS_VERSION) |
| 252 |
@rm -f $(DESTDIR)$(bindir)/gbs$(GAMBAS_VERSION) |
| 253 |
- @(cd $(srcdir)/src; for p in `cat INSTALL`; do rm -f $(DESTDIR)$(bindir)/$$p.gambas; done) |
| 254 |
+ @(for p in `cat $(srcdir)/src/INSTALL`; do \ |
| 255 |
+ rm -f $(DESTDIR)$(bindir)/$$p.gambas; \ |
| 256 |
+ done) |
| 257 |
|
| 258 |
dist-hook: |
| 259 |
@(cd $(distdir)/src; \ |
| 260 |
|
| 261 |
|
| 262 |
|
| 263 |
1.1 dev-util/gambas/files/gambas-2.9.0-help_Makefile.am.patch |
| 264 |
|
| 265 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-help_Makefile.am.patch?rev=1.1&view=markup |
| 266 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-help_Makefile.am.patch?rev=1.1&content-type=text/plain |
| 267 |
|
| 268 |
Index: gambas-2.9.0-help_Makefile.am.patch |
| 269 |
=================================================================== |
| 270 |
--- help/Makefile.am.orig 2008-11-01 |
| 271 |
+++ help/Makefile.am 2008-11-01 |
| 272 |
@@ -2,12 +2,20 @@ |
| 273 |
EXTRA_DIST = reconf spec |
| 274 |
|
| 275 |
install-exec-local: |
| 276 |
- @echo |
| 277 |
- @echo "Installing the gambas help files..." |
| 278 |
- @rm -rf $(DESTDIR)$(gbdatadir)/help |
| 279 |
- @$(INSTALL) -d $(DESTDIR)$(gbdatadir)/help |
| 280 |
- @cp -R $(srcdir)/help $(DESTDIR)$(gbdatadir) |
| 281 |
- @(cd $(DESTDIR)$(gbdatadir)/help; tar xfz $(DESTDIR)$(gbdatadir)/help/help.tar.gz; $(LN_S) help/img img; $(LN_S) help/image image; rm -f Makefile*) |
| 282 |
+ @echo "=== Installing the gambas help files ==="; \ |
| 283 |
+ echo |
| 284 |
+ |
| 285 |
+ @echo "Copying the help files"; \ |
| 286 |
+ rm -rf $(DESTDIR)$(gbdatadir)/help; \ |
| 287 |
+ $(INSTALL) -d $(DESTDIR)$(gbdatadir)/help; \ |
| 288 |
+ cp -R $(srcdir)/help $(DESTDIR)$(gbdatadir) |
| 289 |
+ @echo "Unpacking the help files"; \ |
| 290 |
+ (cd $(DESTDIR)$(gbdatadir)/help; \ |
| 291 |
+ tar xfz $(DESTDIR)$(gbdatadir)/help/help.tar.gz; \ |
| 292 |
+ $(LN_S) help/img img; \ |
| 293 |
+ $(LN_S) help/image image; \ |
| 294 |
+ rm -f Makefile*); \ |
| 295 |
+ echo |
| 296 |
|
| 297 |
uninstall-local: |
| 298 |
@rm -rf $(DESTDIR)$(gbdatadir)/help |
| 299 |
|
| 300 |
|
| 301 |
|
| 302 |
1.1 dev-util/gambas/files/gambas-2.9.0-main_Makefile.am.patch |
| 303 |
|
| 304 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-main_Makefile.am.patch?rev=1.1&view=markup |
| 305 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-main_Makefile.am.patch?rev=1.1&content-type=text/plain |
| 306 |
|
| 307 |
Index: gambas-2.9.0-main_Makefile.am.patch |
| 308 |
=================================================================== |
| 309 |
--- main/Makefile.am.orig 2008-11-02 |
| 310 |
+++ main/Makefile.am 2008-11-02 |
| 311 |
@@ -4,18 +4,25 @@ |
| 312 |
EXTRA_DIST = TODO reconf spec README mime |
| 313 |
|
| 314 |
install-exec-local: |
| 315 |
- @if test x"$(DESTDIR)" != x; then \ |
| 316 |
- echo "Installing with DESTDIR='$(DESTDIR)'"; \ |
| 317 |
- fi |
| 318 |
- @echo "Making runtime symbolic link" |
| 319 |
- @$(LN_S) -f gbx$(GAMBAS_VERSION) $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) || true |
| 320 |
- |
| 321 |
- @if test x"$(XDG_UTILS)" != x; then \ |
| 322 |
+ @echo "=== Installing the runtime ==="; \ |
| 323 |
+ echo |
| 324 |
+ |
| 325 |
+ @if test -n "$(DESTDIR)"; then \ |
| 326 |
+ echo "Installing with DESTDIR=$(DESTDIR)"; \ |
| 327 |
+ fi; \ |
| 328 |
+ echo |
| 329 |
+ |
| 330 |
+ @echo "Creating runtime symbolic link"; \ |
| 331 |
+ $(LN_S) gbx$(GAMBAS_VERSION) $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION); \ |
| 332 |
+ echo |
| 333 |
+ |
| 334 |
+ @if test -n "$(XDG_UTILS)"; then \ |
| 335 |
echo "Registering Gambas executable mimetype"; \ |
| 336 |
$(INSTALL) -d $(DESTDIR)$(gbdatadir)/icons; \ |
| 337 |
- cp -f $(srcdir)/mime/application-x-gambas.png $(DESTDIR)$(gbdatadir)/icons; \ |
| 338 |
+ $(INSTALL) -c -m 644 $(srcdir)/mime/application-x-gambas.png $(DESTDIR)$(gbdatadir)/icons; \ |
| 339 |
xdg-icon-resource install --context mimetypes --size 64 $(DESTDIR)$(gbdatadir)/icons/application-x-gambas.png application-x-gambas; \ |
| 340 |
xdg-mime install $(srcdir)/mime/application-x-gambas.xml; \ |
| 341 |
+ echo; \ |
| 342 |
fi |
| 343 |
|
| 344 |
uninstall-local: |
| 345 |
|
| 346 |
|
| 347 |
|
| 348 |
1.1 dev-util/gambas/files/gambas-2.9.0-comp_Makefile.am.patch |
| 349 |
|
| 350 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-comp_Makefile.am.patch?rev=1.1&view=markup |
| 351 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gambas/files/gambas-2.9.0-comp_Makefile.am.patch?rev=1.1&content-type=text/plain |
| 352 |
|
| 353 |
Index: gambas-2.9.0-comp_Makefile.am.patch |
| 354 |
=================================================================== |
| 355 |
--- comp/Makefile.am.orig 2008-11-01 |
| 356 |
+++ comp/Makefile.am 2008-11-01 |
| 357 |
@@ -4,44 +4,44 @@ |
| 358 |
##AUTOMAKE_OPTIONS = dist-bzip2 |
| 359 |
|
| 360 |
install-exec-local: |
| 361 |
- @if test "x$(ROOT)" != "x"; then \ |
| 362 |
- echo "Installing with ROOT=$(ROOT)"; \ |
| 363 |
- echo; \ |
| 364 |
- fi |
| 365 |
- |
| 366 |
- @if test "x$(DESTDIR)" != "x"; then \ |
| 367 |
- echo "Installing with DESTDIR=$(DESTDIR)"; \ |
| 368 |
- echo; \ |
| 369 |
- ROOT=$DESTDIR; \ |
| 370 |
- fi |
| 371 |
- |
| 372 |
- @echo "Running the informer again because of dependencies between information files" |
| 373 |
- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) |
| 374 |
- |
| 375 |
- @echo "Installing the components..." |
| 376 |
- @(cd $(srcdir)/src; d=`pwd`; for p in `cat order`; do \ |
| 377 |
- echo "Compiling $$p..."; \ |
| 378 |
- cd $$d/$$p; \ |
| 379 |
- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ |
| 380 |
- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 381 |
- rm -rf .gambas; \ |
| 382 |
- echo "Installing $$p..."; \ |
| 383 |
- $(INSTALL) $$p.gambas $(DESTDIR)$(gblibdir); \ |
| 384 |
- $(INSTALL) .component $(DESTDIR)$(gblibdir)/$$p.component; \ |
| 385 |
- chmod a-x $(DESTDIR)$(gblibdir)/$$p.component; \ |
| 386 |
- $(INSTALL) .info $(DESTDIR)$(gbdatadir)/info/$$p.info; \ |
| 387 |
- chmod a-x $(DESTDIR)$(gbdatadir)/info/$$p.info; \ |
| 388 |
- $(INSTALL) .list $(DESTDIR)$(gbdatadir)/info/$$p.list; \ |
| 389 |
- chmod a-x $(DESTDIR)$(gbdatadir)/info/$$p.list; \ |
| 390 |
- done; true) |
| 391 |
+ @echo "=== Installing the components ==="; \ |
| 392 |
+ echo |
| 393 |
+ |
| 394 |
+ @if test -n "$(ROOT)"; then \ |
| 395 |
+ echo "Installing with ROOT=$(ROOT)"; \ |
| 396 |
+ fi; \ |
| 397 |
+ if test -n "$(DESTDIR)"; then \ |
| 398 |
+ echo "Installing with DESTDIR=$(DESTDIR)"; \ |
| 399 |
+ ROOT=$DESTDIR; \ |
| 400 |
+ fi; \ |
| 401 |
+ echo |
| 402 |
+ |
| 403 |
+ @echo "Running the informer again because of dependencies between information files"; \ |
| 404 |
+ $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix); \ |
| 405 |
+ echo |
| 406 |
+ |
| 407 |
+ @(for p in `cat $(srcdir)/src/order`; do \ |
| 408 |
+ echo -n "Compiling $$p ... "; \ |
| 409 |
+ cd $(abs_srcdir)/src/$$p; \ |
| 410 |
+ if $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); then \ |
| 411 |
+ $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ |
| 412 |
+ echo "Installing $$p"; \ |
| 413 |
+ rm -rf .gambas; \ |
| 414 |
+ $(INSTALL) $$p.gambas $(DESTDIR)$(gblibdir); \ |
| 415 |
+ $(INSTALL) -c -m 644 .component $(DESTDIR)$(gblibdir)/$$p.component; \ |
| 416 |
+ $(INSTALL) -c -m 644 .info $(DESTDIR)$(gbdatadir)/info/$$p.info; \ |
| 417 |
+ $(INSTALL) -c -m 644 .list $(DESTDIR)$(gbdatadir)/info/$$p.list; \ |
| 418 |
+ fi \ |
| 419 |
+ done); \ |
| 420 |
+ echo |
| 421 |
|
| 422 |
uninstall-local: |
| 423 |
- @(cd $(srcdir)/src; for p in *; do \ |
| 424 |
- rm -f $(DESTDIR)$(gblibdir)/$$p.gambas; \ |
| 425 |
- rm -f $(DESTDIR)$(gblibdir)/$$p.component; \ |
| 426 |
- rm -f $(DESTDIR)$(gbdatadir)/info/$$p.info; \ |
| 427 |
- rm -f $(DESTDIR)$(gbdatadir)/info/$$p.list; \ |
| 428 |
- done) |
| 429 |
+ @(for p in `cat $(srcdir)/src/order`; do \ |
| 430 |
+ rm -f $(DESTDIR)$(gblibdir)/$$p.gambas; \ |
| 431 |
+ rm -f $(DESTDIR)$(gblibdir)/$$p.component; \ |
| 432 |
+ rm -f $(DESTDIR)$(gbdatadir)/info/$$p.info; \ |
| 433 |
+ rm -f $(DESTDIR)$(gbdatadir)/info/$$p.list; \ |
| 434 |
+ done) |
| 435 |
|
| 436 |
dist-hook: |
| 437 |
@(cd $(distdir)/src; rm -rf `find . -name ".gambas" -o -name ".lock" -o -name ".xvpics" -o -name "*~" -o -name "*.out" -o -name "*.pot" -o -name "*.gambas" -o -name "core.*" -o -name ".kdbg*" -o -name ".svn"`;) |
Archives