Skip to content
Snippets Groups Projects
Commit 74bd6bc5 authored by Claus-Justus Heine's avatar Claus-Justus Heine
Browse files

Changes:

Most important:

Parallel installation with ALBERTA-1.X works fine now. To achieve this
the following changes were necessary:

- headers are installed in PREFIX/include/alberta2/
- libalberta_util.XX -> libalberta2_util.XX
- Makefile.alberta is installed in PREFIX/share/alberta2/ 
- package name was changed to alberta2
- libtool.alberta -> libtool.alberta2, intalled in PREFIX/libexec/ as usual
- alberta_grape etc. -> alberta2_grape

No need to change the names of other add-ons because they were not
present in ALBERTA-1.X.

Further changes:

- The preprocessor symbol DEBUG is quite overloaded. It has been
  changed to ALBERTA_DEBUG, the Makefile.alberta has been changed
  accordingly, and (hopefully) all source files using DEBUG.

- "make dist" was broken. This was caused by automake
  brain-damagedness: adding a directory to EXTRA_DIST results in
  copying that directory TWICE to the distribution directory, however,
  "make dist" likes to create several file read-only, so the second
  attempt to copy the directory contents would fail (permission denied).

  Also, some of the auto-generated files were not removed by "make
  distclean" which led to a failing "make distcheck".

This mess was comitted by cH (aka alberta on pizza).
parent 6d7695c4
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ ACLOCAL_AMFLAGS = -I ./m4 ...@@ -10,6 +10,7 @@ ACLOCAL_AMFLAGS = -I ./m4
# #
if INSTALL_LIBTOOL if INSTALL_LIBTOOL
BUILT_SOURCES = libtool.alberta2
libexec_SCRIPTS = libtool.@PACKAGE@ libexec_SCRIPTS = libtool.@PACKAGE@
libtool.@PACKAGE@: libtool libtool.@PACKAGE@: libtool
cp libtool libtool.@PACKAGE@ cp libtool libtool.@PACKAGE@
...@@ -48,7 +49,12 @@ clean-local: ...@@ -48,7 +49,12 @@ clean-local:
-rm -f $(DEMO).tar.gz -rm -f $(DEMO).tar.gz
distclean-local: distclean-local:
-rm -rf $(DEMO) -rm -f $(BUILT_SOURCES)
-chmod -R u+rwX $(DEMO) && rm -rf $(DEMO)
-if ! test "$(srcdir)" = "." ; then \
chmod -R u+rwX demo ; \
rm -rf demo ; \
fi
if MAINTAINER_MODE if MAINTAINER_MODE
# These targets only makes sense for maintainers!! # These targets only makes sense for maintainers!!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment