The attached patch is needed to get freeamp to
build in a directory other than the src dir.
Mo DeJong
Red Hat Inc
Index: Makefile-plugins.in
===================================================================
RCS file: /src/repository/freeamp/Makefile-plugins.in,v
retrieving revision 1.70
diff -u -r1.70 Makefile-plugins.in
--- Makefile-plugins.in 2000/07/12 23:02:07 1.70
+++ Makefile-plugins.in 2000/07/13 05:14:28
@@ -15,7 +15,7 @@
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/freeamp/`echo $$p|sed
'$(transform)'`; \
else :; fi; \
done
- $(INSTALL_PROGRAM) ftc/winamp/winamp_theme.xml
$(DESTDIR)$(libdir)/freeamp/plugins/winamp_theme.xml
+ $(INSTALL_PROGRAM) $(srcdir)/ftc/winamp/winamp_theme.xml
+$(DESTDIR)$(libdir)/freeamp/plugins/winamp_theme.xml
uninstall_plugins uninstall-plugins:
@list=`ls plugins/*.*`; for p in $$list; do \
Index: Makefile.in
===================================================================
RCS file: /src/repository/freeamp/Makefile.in,v
retrieving revision 1.61
diff -u -r1.61 Makefile.in
--- Makefile.in 2000/05/20 12:32:00 1.61
+++ Makefile.in 2000/07/13 05:14:28
@@ -85,8 +85,9 @@
DIRECTORIES += io/soundcard/beos io/soundcard/unix io/soundcard/unix/linux
DIRECTORIES += io/soundcard/beos/src io/soundcard/unix/linux/src
DIRECTORIES += io/wavout io/wavout/src io/wavout/include
-DIRECTORIES += io/soundcard/unix/solaris lib lib/xml lib/zlib lmc lmc/xingmp3
-DIRECTORIES += io/soundcard/unix/solaris/src lib/gdbm lib/xml/src lib/zlib/src
+DIRECTORIES += io/soundcard/unix/solaris io/soundcard/unix/solaris/src
+DIRECTORIES += lib lib/xml lib/xml/src lib/http lib/http/src lib/zlib lmc
+DIRECTORIES += lmc/xingmp3 lib/gdbm lib/zlib/src
DIRECTORIES += plm plm/metadata plm/playlist plm/portable plm/portable/pmp300
DIRECTORIES += lmc/xingmp3/src plm/metadata/id3v1 plm/metadata/id3v2
DIRECTORIES += plm/metadata/misc plm/playlist/m3u plm/portable/pmp300/sba ui
@@ -94,15 +95,15 @@
DIRECTORIES += ui/cmdline ui/download/unix/src ui/freeamp/beos/src
DIRECTORIES += ui/freeamp/tools ui/freeamp/unix ui/irman ui/lcd ui/musicbrowser
DIRECTORIES += ui/freeamp/src ui/freeamp/tools/src ui/freeamp/unix/src
-DIRECTORIES += ui/musicbrowser/unix ui/mpg123 plm/playlist/pls
+DIRECTORIES += ui/musicbrowser/src ui/musicbrowser/unix ui/mpg123 plm/playlist/pls
DIRECTORIES += ui/irman/src ui/lcd/src ui/musicbrowser/unix/src ui/ncurses
DIRECTORIES += update update/unix lmc/cd lmc/cd/src io/cd io/cd/unix
-DIRECTORIES += io/cd/unix/src lib/unzip lib/unzip/src ftc ftc/winamp
+DIRECTORIES += io/cd/unix/src lib/unzip lib/unzip/src ftc ftc/kjofol ftc/winamp
DIRECTORIES += plm/metadata/cddb
dirs:
for p in $(DIRECTORIES); do \
- test -d $$p || mkdir $$p; \
+ test -d $$p || mkdir -p $$p; \
done
freeamp: $(FREEAMPOBJ) $(freeamp_DEPENDENCIES)
Index: configure.in
===================================================================
RCS file: /src/repository/freeamp/configure.in,v
retrieving revision 1.103
diff -u -r1.103 configure.in
--- configure.in 2000/06/13 20:24:31 1.103
+++ configure.in 2000/07/13 05:14:30
@@ -348,7 +348,7 @@
echo "WARNING: You don't have FreeType installed. This means that FreeAmp"
echo "will fall back on X fonts. To make FreeAmp's GUI interface all pretty,"
echo "you need FreeType. Get the latest stable version at: "
- echo "http://www.freetype.org/download.htm"
+ echo "http://www.freetype.org/download.html"
fi
AC_SUBST(TTF_LIBS)
