From 3a5fbfe3a782476ebbc0a3ba14ca9c04632f7523 Mon Sep 17 00:00:00 2001
From: Jean-Michel Paris <jean_michel_paris@hotmail.fr>
Date: Mon, 6 Feb 2017 19:50:01 +0100
Subject: [PATCH] Fix install/uninstall rules

Install properlly in /usr/local
---
 {dsk => images}/Master.dsk  | Bin
 src/Makefile                |  61 ++++++++++++++++++++++++------------
 src/linapple.installed.conf |   4 +--
 3 files changed, 43 insertions(+), 22 deletions(-)
 rename {dsk => images}/Master.dsk (100%)

diff --git a/dsk/Master.dsk b/images/Master.dsk
similarity index 100%
rename from dsk/Master.dsk
rename to images/Master.dsk
diff --git a/src/Makefile b/src/Makefile
index 7e8cd25..dcee8c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,28 +1,46 @@
-CXX ?= c++
-CXXFLAGS ?= -O3
-CXXFLAGS += -w
+#
+# Makefile
+#
 
-OBJS := $(filter-out Applewin.cpp Util_MemoryTextFile.cpp,$(wildcard *.cpp))
-OBJS := $(OBJS:.cpp=.o)
+# Compiler flags
+CXX			?=	c++
+CXXFLAGS	?=	-O3
+CXXFLAGS	+=	-w
 
-SDL_CONFIG ?= sdl-config
+# SDL Library
+SDL_CONFIG	?=	sdl-config
 #SDL_CONFIG ?= sdl2-config
-SDL_CFLAGS = $(shell $(SDL_CONFIG) --cflags)
-SDL_LIBS = $(shell $(SDL_CONFIG) --libs)
+SDL_CFLAGS	=	$(shell $(SDL_CONFIG) --cflags)
+SDL_LIBS	=	$(shell $(SDL_CONFIG) --libs)
+
+CXXFLAGS	+=	$(SDL_CFLAGS)
+LDLIBS		+=	$(SDL_LIBS)
+
+
+# CURL Library
+CURL_CONFIG ?=	curl-config
+CURL_CFLAGS	=	$(shell $(CURL_CONFIG) --cflags)
+CURL_LIBS	=	$(shell $(CURL_CONFIG) --libs)
 
-CURL_CONFIG ?= curl-config
-CURL_CFLAGS = $(shell $(CURL_CONFIG) --cflags)
-CURL_LIBS = $(shell $(CURL_CONFIG) --libs)
+CXXFLAGS	+=	$(CURL_CFLAGS)
+LDLIBS		+=	$(CURL_LIBS)
 
-CXXFLAGS += $(SDL_CFLAGS)
-CXXFLAGS += $(CURL_CFLAGS)
-LDLIBS += $(SDL_LIBS) $(CURL_LIBS) -lz -lzip
+
+# Extra libs
+LDLIBS		+=	-lz -lzip
+
+
+OBJS		:=	$(filter-out Applewin.cpp Util_MemoryTextFile.cpp,$(wildcard *.cpp))
+OBJS		:=	$(OBJS:.cpp=.o)
 
 # Define executable and installing directory
-EXE = linapple
-INSTDIR = /usr/local/$(EXE)
-STARTUP = /usr/local/bin/$(EXE)
-DATA = ../charset40.bmp ../font.bmp ../icon.bmp ../splash.bmp ../Master.dsk ../linapple.installed.conf
+EXE		=	linapple
+INSTDIR =	/usr/local/$(EXE)
+STARTUP =	/usr/local/bin/$(EXE)
+
+RES		=	resources
+DSK 	=	../images/Master.dsk
+CONF	=	linapple.installed.conf
 
 .PHONY: all clean install uninstall
 
@@ -40,7 +58,7 @@ clean:
 	rm -f $(EXE) *.o
 
 #
-# Installation routines
+# Installation/uninstallation rules
 #
 
 install: all
@@ -51,7 +69,10 @@ install: all
 	mkdir -p "$(INSTDIR)/ftp/cache"
 
 	@echo " o Installing game and data to '$(INSTDIR)'"
-	cp $(EXE) $(DATA) "$(INSTDIR)"
+	cp $(EXE) "$(INSTDIR)"
+	cp -r $(RES) "$(INSTDIR)"
+	cp $(CONF) "$(INSTDIR)"
+	cp $(DSK) "$(INSTDIR)/images"
 
 	@echo " o Preparing configuration file 'linapple.conf'"
 	mv "$(INSTDIR)/linapple.installed.conf" "$(INSTDIR)/linapple.conf"
diff --git a/src/linapple.installed.conf b/src/linapple.installed.conf
index bb6b7d8..bdaceb2 100644
--- a/src/linapple.installed.conf
+++ b/src/linapple.installed.conf
@@ -186,13 +186,13 @@
 
 # To get access to the disk in second drive(D2), use something like '] CATALOG,D2' at Applesoft DOS(tm) prompt.
 
-	Disk Image 1 =	
+	Disk Image 1 =	/usr/local/linapple/images/Master.dsk
 	Disk Image 2 =	
 
 # The next parameter defines if you wish to auto-load these disk images in drives at startup!
 # Default value is 0 (Off), suggested: 1 (On)
 
-	Slot 6 Autoload =	0
+	Slot 6 Autoload =	1
 
 ##########################################################################
 #