From cbc77b202d3ab38b7f696ab9e71ab0b12cc5e648 Mon Sep 17 00:00:00 2001 From: gbeauche <> Date: Sun, 9 May 2004 17:55:11 +0000 Subject: [PATCH] Link keycodes & tunconfig files, DESTDIR'ify Unix/Makefile --- SheepShaver/Makefile | 1 + SheepShaver/src/Unix/Makefile.in | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/SheepShaver/Makefile b/SheepShaver/Makefile index bb334558..288eff95 100644 --- a/SheepShaver/Makefile +++ b/SheepShaver/Makefile @@ -60,6 +60,7 @@ links: Unix/sigsegv.h Unix/sigsegv.cpp Unix/vm_alloc.h Unix/vm_alloc.cpp \ Unix/posix_sem.cpp Unix/video_vosf.h Unix/video_blit.h \ Unix/video_blit.cpp Unix/config.sub Unix/config.guess \ + Unix/keycodes Unix/tunconfig \ Unix/Linux/scsi_linux.cpp Unix/Linux/NetDriver\ Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c \ Unix/Darwin/testlmem.sh dummy/audio_dummy.cpp \ diff --git a/SheepShaver/src/Unix/Makefile.in b/SheepShaver/src/Unix/Makefile.in index e7172790..a91ac0e7 100644 --- a/SheepShaver/src/Unix/Makefile.in +++ b/SheepShaver/src/Unix/Makefile.in @@ -11,6 +11,8 @@ datadir = @datadir@ mandir = @mandir@ man1dir = $(mandir)/man1 +DESTDIR = + CC = @CC@ CXX = @CXX@ CFLAGS = @CFLAGS@ @@ -76,15 +78,20 @@ modules: cd NetDriver; make install: $(APP) installdirs - $(INSTALL_PROGRAM) $(APP) $(bindir)/$(APP) - -$(INSTALL_DATA) $(APP).1 $(man1dir)/$(APP).1 + $(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP) + -$(INSTALL_DATA) $(APP).1 $(DESTDIR)$(man1dir)/$(APP).1 + $(INSTALL_DATA) keycodes $(DESTDIR)$(datadir)/$(APP)/keycodes + $(INSTALL_DATA) tunconfig $(DESTDIR)$(datadir)/$(APP)/tunconfig installdirs: - $(SHELL) mkinstalldirs $(bindir) $(man1dir) + $(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(datadir)/$(APP) uninstall: - rm -f $(bindir)/$(APP) - rm -f $(man1dir)/$(APP).1 + rm -f $(DESTDIR)$(bindir)/$(APP) + rm -f $(DESTDIR)$(man1dir)/$(APP).1 + rm -f $(DESTDIR)$(datadir)/$(APP)/keycodes + rm -f $(DESTDIR)$(datadir)/$(APP)/tunconfig + rmdir $(DESTDIR)$(datadir)/$(APP) clean: rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp