Skip to content

Commit

Permalink
Install fixes.
Browse files Browse the repository at this point in the history
Install the rom files where they should go, and
include README.md, LICENSE, and THANKS.
  • Loading branch information
micahcowan committed Jul 30, 2023
1 parent 7eb30bd commit 8990a38
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
EXTRA_DIST = README.md
dist_doc_DATA = README.md LICENSE THANKS
SUBDIRS = src test
10 changes: 6 additions & 4 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS=subdir-objects
WARNINGS=-Wall -Werror -Wno-unused -Wno-unused-result
# XXX: ROMSRCHDIR should be decided in ./configure script
ROMSRCHDIR=$(datarootdir)/$(PACKAGE_TARNAME)
AM_CPPFLAGS=-I$(PWD) -DROMSRCHDIR='"$(ROMSRCHDIR)"'
romdir=$(pkgdatadir)/roms
AM_CPPFLAGS=-I$(PWD) -DROMSRCHDIR='"$(romdir)"'
#CCDEBUG=-g -Og
CFLAGS=$(WARNINGS) -std=c99 -pedantic $(CCDEBUG)
bobbin_SOURCES=main.c bobbin.c config.c cpu.c mem.c trace.c interfaces/iface.c interfaces/simple.c util.c signal.c debug.c disasm.c machine.c hook.c watch.c sha-256.c sha-256.h bobbin-internal.h apple2.h ac-config.h
Expand All @@ -15,7 +15,9 @@ noinst_PROGRAMS=sha256-verify
BUILT_SOURCES = option-names.h machine-names.h help-text.h
EXTRA_DIST = scripts/gen-help.awk scripts/gen-options.awk \
scripts/gen-machines.awk scripts/check-options.awk \
roms/apple2.rom roms/apple2plus.rom $(BUILT_SOURCES)
$(BUILT_SOURCES)
A2ROMS=roms/apple2.rom roms/apple2plus.rom
dist_rom_DATA=$(A2ROMS)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = roms/*.rom cscope.out trace.log

Expand Down Expand Up @@ -44,7 +46,7 @@ option-names.h: ../README.md scripts/gen-options.awk
mv $@.out $@

help-text.h: ../README.md scripts/gen-help.awk
$(AWK) -f $(srcdir)/scripts/gen-help.awk < $< > $@.out
$(AWK) -f $(srcdir)/scripts/gen-help.awk -v DOCDIR=$(docdir) < $< > $@.out
mv $@.out $@

machine-names.h: ../README.md scripts/gen-machines.awk
Expand Down
2 changes: 1 addition & 1 deletion src/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static size_t ramloadsz;
static const char * const rom_dirs[] = {
"BOBBIN_ROMDIR", // not a dirname, an env var name
"./roms", // also not a dirname; we'll use bobbin's dir instead
ROMSRCHDIR "/roms",
ROMSRCHDIR,
};
static const char * const *romdirp = rom_dirs;
static const char * const * const romdend = rom_dirs + (sizeof rom_dirs)/(sizeof rom_dirs[0]);
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/gen-help.awk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BEGIN {
/^#/ {
if (IN_SYNOPSIS) {
o("")
o("See the included README.md for much, much more detail.")
o("See " DOCDIR "/README.md for much, much more detail.")
}
IN_SYNOPSIS = 0;
}
Expand Down

0 comments on commit 8990a38

Please sign in to comment.