[[project @ 1997-05-13 18:54:21 by jimb] jimb**19970513185425 Ignore-this: e86677656a66b4f1e819d4321664404b Lie to automake in a different way, to get it to install things in the right place. * configure.in (AM_INIT_AUTOMAKE): Call the package guile-scsh, not guile; this determines the name of the disty. * Makefile.am (scshdir): Renamed from subpkgdatadir. Use $(datadir)/guile instead of $(pkgdatadir), since the latter's value uses the package name given to AM_INIT_AUTOMAKE. (scsh_DATA): Renamed from subpkgdata_DATA. (EXTRA_DIST): Fix reference. * Makefile.in, configure: Regenerated. ] hunk ./Makefile.am 5 -subpkgdatadir = $(pkgdatadir)/$(VERSION)/scsh -subpkgdata_DATA = char-set.scm \ +scshdir = $(datadir)/guile/$(VERSION)/scsh +scsh_DATA = char-set.scm \ hunk ./Makefile.am 12 -EXTRA_DIST = $(subpkgdata_DATA) INCOMPAT +EXTRA_DIST = $(scsh_DATA) INCOMPAT hunk ./Makefile.in 58 -subpkgdatadir = $(pkgdatadir)/$(VERSION)/scsh -subpkgdata_DATA = char-set.scm \ +scshdir = $(datadir)/guile/$(VERSION)/scsh +scsh_DATA = char-set.scm \ hunk ./Makefile.in 65 -EXTRA_DIST = $(subpkgdata_DATA) INCOMPAT +EXTRA_DIST = $(scsh_DATA) INCOMPAT hunk ./Makefile.in 69 -DATA = $(subpkgdata_DATA) +DATA = $(scsh_DATA) hunk ./Makefile.in 97 -install-subpkgdataDATA: $(subpkgdata_DATA) +install-scshDATA: $(scsh_DATA) hunk ./Makefile.in 99 - $(mkinstalldirs) $(subpkgdatadir) - @list='$(subpkgdata_DATA)'; for p in $$list; do \ + $(mkinstalldirs) $(scshdir) + @list='$(scsh_DATA)'; for p in $$list; do \ hunk ./Makefile.in 102 - echo " $(INSTALL_DATA) $(srcdir)/$$p $(subpkgdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(subpkgdatadir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(scshdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(scshdir)/$$p; \ hunk ./Makefile.in 105 - echo " $(INSTALL_DATA) $$p $(subpkgdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(subpkgdatadir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(scshdir)/$$p"; \ + $(INSTALL_DATA) $$p $(scshdir)/$$p; \ hunk ./Makefile.in 110 -uninstall-subpkgdataDATA: +uninstall-scshDATA: hunk ./Makefile.in 112 - list='$(subpkgdata_DATA)'; for p in $$list; do \ - rm -f $(subpkgdatadir)/$$p; \ + list='$(scsh_DATA)'; for p in $$list; do \ + rm -f $(scshdir)/$$p; \ hunk ./Makefile.in 170 -install-data: install-subpkgdataDATA +install-data: install-scshDATA hunk ./Makefile.in 176 -uninstall: uninstall-subpkgdataDATA +uninstall: uninstall-scshDATA hunk ./Makefile.in 183 - $(mkinstalldirs) $(subpkgdatadir) + $(mkinstalldirs) $(scshdir) hunk ./Makefile.in 212 -.PHONY: default uninstall-subpkgdataDATA install-subpkgdataDATA tags \ -distdir info dvi installcheck install-exec install-data install \ -uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +.PHONY: default uninstall-scshDATA install-scshDATA tags distdir info \ +dvi installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean hunk ./configure 607 -PACKAGE=guile +PACKAGE=guile-scsh hunk ./configure.in 3 -AM_INIT_AUTOMAKE(guile, 1.1a, no-define) +AM_INIT_AUTOMAKE(guile-scsh, 1.1a, no-define)