Skip to content

Commit

Permalink
install gwcbatch, and don't automatically strip gtk-wave-cleaner
Browse files Browse the repository at this point in the history
  • Loading branch information
AlisterH committed Apr 16, 2019
1 parent b4bc5b8 commit ebae196
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# 3. We haven't properly integrated meschach. Make here doesn't recognise if any of meschach's header or source files have changed, and autoconf or autoreconf here doesn't touch it. (also see note in meschach/configure - neither autoconf nor building in meschach actually works in our version).
# 4. `make dist` needs to be told to include all of the header and source files, as we haven't specified them as gwc_SOURCES.
# 5. `make clean` errors trying to clean the meschach directory if `make` has not been run :)
# 6. `make install-strip` doesn't strip
# etc

# Note if we contemplate updating meschach or using an external meschach library we need to check what Jeff did to our version:
# - Jeff said he fixed a bad memory leak (I *think* this is also fixed in the debian version).
Expand Down Expand Up @@ -67,6 +69,7 @@ meschach/zcopy.c meschach/zfunc.c meschach/zgivens.c meschach/zhessen.c meschach
meschach/zsolve.c meschach/ztorture.c meschach/zvecop.c

BINFILES = $(APPNAME)
# Alister: normally this should automatically cause `make [un]install` to install/uninstall it, but in our case we are doing it manually below
dist_bin_SCRIPTS = gwcbatch
# Confusingly we don't have the DOCFILES in the doc directory, only the HELPFILES
DOCFILES = README INSTALL TODO COPYING Changelog
Expand Down Expand Up @@ -123,15 +126,15 @@ install : gwc
install -d "$(DESTDIR)"$(BINDIR)
install -d "$(DESTDIR)"$(DOCDIR)/$(APPNAME)
install -d "$(DESTDIR)"$(HELPDIR)/$(APPNAME)
install -p -s $(BINFILES) "$(DESTDIR)"$(BINDIR)
install -p $(BINFILES) $(dist_bin_SCRIPTS) "$(DESTDIR)"$(BINDIR)
install -p -m 0644 $(DOCFILES) "$(DESTDIR)"$(DOCDIR)/$(APPNAME)
for hf in $(HELPFILES) ; do install -p -m 0644 $(HELPFILESSRCD)/$$hf "$(DESTDIR)"$(HELPDIR)/$(APPNAME) ; done
for hf in $(DATADIRS) ; do install -d "$(DESTDIR)"$(DATADIR)/$$hf && install -p -m 0644 data/$$hf/$(APPNAME).* "$(DESTDIR)"$(DATADIR)/$$hf ; done
# if we are using DESTDIR this is pointless, so should we skip it?:
gtk-update-icon-cache -f -t "$(DESTDIR)"$(DATADIR)/icons/hicolor

uninstall :
( cd "$(DESTDIR)"$(BINDIR) && rm -f $(BINFILES) )
( cd "$(DESTDIR)"$(BINDIR) && rm -f $(BINFILES) $(dist_bin_SCRIPTS) )
( cd "$(DESTDIR)"$(DOCDIR)/$(APPNAME) && rm -f $(DOCFILES) )
( cd "$(DESTDIR)"$(HELPDIR)/$(APPNAME) && rm -f $(HELPFILES) )
# Alister: note osx errors on --ignore-fail-on-non-empty
Expand Down

0 comments on commit ebae196

Please sign in to comment.