tarball compile fix (1.8.3)

dweymouth · Mar 20, 2020 · 3e7c048 · 3e7c048
1 parent 1bea5b4
commit 3e7c048
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS = pixmaps\
 		  icons\
 		  shared\
 		  ${PLUGINS_DIRS}\
-		  po
+		  po\
+		  intl
 
 bin_PROGRAMS = deadbeef
 

diff --git a/configure.ac b/configure.ac
@@ -16,7 +16,7 @@ AC_PROG_INSTALL
 dnl AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_C_BIGENDIAN
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT
 PKG_PROG_PKG_CONFIG
 AM_PROG_CC_C_O
 AM_ICONV
@@ -949,6 +949,7 @@ plugins/sc68/Makefile
 plugins/coreaudio/Makefile
 plugins/rg_scanner/Makefile
 po/Makefile.in
+intl/Makefile
 deadbeef.desktop
 ])
 

diff --git a/main.c b/main.c
@@ -85,9 +85,11 @@
 #include "playqueue.h"
 #include "tf.h"
 #include "logger.h"
+#ifdef OSX_APPBUNDLE
 #include "scriptable/scriptable.h"
 #include "scriptable/scriptable_dsp.h"
 #include "scriptable/scriptable_encoder.h"
+#endif
 
 #ifndef PREFIX
 #error PREFIX must be defined

diff --git a/plugins/dumb/dumb-kode54/src/helpers/lpc.c b/plugins/dumb/dumb-kode54/src/helpers/lpc.c
@@ -44,7 +44,7 @@ Carsten Bormann
 *********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "../../../../config.h"
+#include "../../../../../config.h"
 #endif
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>

diff --git a/plugins/vfs_curl/Makefile.am b/plugins/vfs_curl/Makefile.am
@@ -1,6 +1,6 @@
 if HAVE_VFS_CURL
 pkglib_LTLIBRARIES = vfs_curl.la
-vfs_curl_la_SOURCES = vfs_curl.c
+vfs_curl_la_SOURCES = vfs_curl.c vfs_curl.h
 vfs_curl_la_LDFLAGS = -module -avoid-version
 
 vfs_curl_la_LIBADD = $(LDADD) $(CURL_LIBS)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,8 @@ SUBDIRS = pixmaps\ @@
     		  icons\
     		  shared\
     		  ${PLUGINS_DIRS}\
-    		  po
+    		  po\
+    		  intl
     bin_PROGRAMS = deadbeef
@@ Expand Down @@