$OpenBSD: patch-Makefile_in,v 1.3 2001/08/25 11:19:25 espie Exp $
--- Makefile.in.orig	Tue Dec 14 09:42:14 1999
+++ Makefile.in	Sat Aug 25 12:43:01 2001
@@ -8,7 +8,7 @@ VPATH=@srcdir@
 srcdir=@srcdir@
 
 @SET_MAKE@
-FLAGS=@TYPESIZES@ @CFLAGS@
+FLAGS=@GETOPT_LONG@ @TYPESIZES@ @CFLAGS@
 OPT=@OPT@ $(FLAGS)
 DEBUG=@DEBUG@ $(FLAGS)
 CC=@CC@
@@ -23,33 +23,33 @@ BINDIR=@bindir@
 MANDIR=@mandir@
 INCLUDEDIR=@includedir@
 LIBDIR=@libdir@
-PWD = $(shell pwd)
+PWD != pwd
+MAJOR=0
+MINOR=0
 
 OFILES = main.o report.o header.o buffering_write.o
 
-export STATIC 
-export VERSION
+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
+STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 
-ifeq ($(STATIC),TRUE)
-	LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
-		-static -lm
-	LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
-else
-	LIBS = -lcdda_interface -lcdda_paranoia -lm
-	LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
-endif
+SHLIBS = -lcdda_interface -lcdda_paranoia -lm
+SHLIBDEP = interface/libcdda_interface.so.$(MAJOR).$(MINOR) paranoia/libcdda_paranoia.so.$(MAJOR).$(MINOR)
 
 
-all: 	
+all:
 	cd interface && $(MAKE) all
 	cd paranoia && $(MAKE) all
-	$(MAKE) cdparanoia CFLAGS="$(OPT)" 
-	strip cdparanoia
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
 
-debug:  
+static:
+	cd interface && $(MAKE) lib
+	cd paranoia && $(MAKE) lib
+	$(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
+
+debug:
 	cd interface && $(MAKE) debug
 	cd paranoia && $(MAKE) debug
-	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" STATIC=TRUE
+	$(MAKE) cdparanoia CFLAGS="$(DEBUG)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
 
 test:	
 	cd interface && $(MAKE) all
@@ -64,22 +64,14 @@ slib:
 	cd paranoia && $(MAKE) slib
 
 install:
-	$(INSTALL) -p -m 0755 $(srcdir)/cdparanoia $(BINDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
-	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
-	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
-	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so.0
-	ln -fs libcdda_interface.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_interface.so
-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so.0
-	ln -fs libcdda_paranoia.so.0.$(VERSION) \
-		$(LIBDIR)/libcdda_paranoia.so
+	$(INSTALL) -p -m 0755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -p -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
 
 cdparanoia:	$(OFILES) $(LIBDEP)
 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
