diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2009-07-03 08:44:32 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2009-07-03 08:44:32 +0200 |
| commit | 7e04afa6ed165c8d61e40c5720a464f2da6a97b4 (patch) | |
| tree | 76bfe693bc1b0d9c2b799c2f43bfe8a196b4af36 | |
| parent | 187b28805bf2c8086414671fae85c85813f03a5e (diff) | |
Split build: make install works.
Needs the most recent changes from the bootstrap.
* .gitignore: Ignore what is generated during make install.
* Makefile.am: make install itself.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 5e6184160..7a7ce93da 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ /config.status /configure /install-sh +/logfile.log /missing +/OpenOffice /solver /*/unxlng??.pro diff --git a/Makefile.am b/Makefile.am index 033370532..6c127169a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,8 @@ stampdir = $(top_builddir)/build/stamp pkgconfigdir = $(libdir)/pkgconfig ooo_prefix = @OOO_PREFIX@ +solenvdir = $(ooo_prefix)/solenv +buildsolverdir = "@abs_builddir@/solver" # what to add to the package @@ -25,8 +27,13 @@ clean-local: # TODO distclean-local: -# TODO install-data-local: $(stampdir)/all + ( . buildenv -i ; \ + export PRODUCT="OpenOffice" ; \ + perl -w $(solenvdir)/bin/make_installer.pl \ + -f $(ooo_prefix)/instsetoo_native/util/openoffice.lst \ + -l 'en-US' -p "$$PRODUCT" -buildid "$$BUILD" \ + -dontstrip -verbose -simple $(DESTDIR)$(ooo_prefix) ) $(stampdir)/all: buildenv ( . buildenv ; cd build ; build.pl --all ) && touch $@ |