Subject: vendor/luajit is removed in the Debian package Author: Sebastian Reichel Forwarded: not-needed Last-Update: 2014-08-06 Index: header.mk =================================================================== --- header.mk.orig 2018-08-29 16:09:52.447078198 +0200 +++ header.mk 2018-08-29 16:13:15.670809749 +0200 @@ -13,7 +13,6 @@ subdirs := \ tests \ tools \ vendor/luabins \ - vendor/luajit subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) Index: Makefile.inc.in =================================================================== --- Makefile.inc.in.orig 2018-08-29 16:10:05.587577013 +0200 +++ Makefile.inc.in 2018-08-29 16:14:01.836568832 +0200 @@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@ CFLAGS_ICU = @ICU_I18N_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@ CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ -CFLAGS_LUA = @LUAJIT_CFLAGS@ +CFLAGS_LUA = `pkg-config --cflags luajit` CFLAGS_OPENAL = @OPENAL_CFLAGS@ CFLAGS_OSS = @OSS_CFLAGS@ CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ @@ -97,14 +97,14 @@ LIBS_ICONV = @ICONV_LIBS@ LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@ LIBS_LIBASS = @LIBASS_LIBS@ LIBS_LIBPULSE = @LIBPULSE_LIBS@ -LIBS_LUA = @LUAJIT_LIBS@ +LIBS_LUA = `pkg-config --libs luajit` LIBS_OPENAL = @OPENAL_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ LIBS_UCHARDET = @UCHARDET_LIBS@ ifeq (yes, $(BUILD_DARWIN)) -LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so +LIBS_LUA = `pkg-config --libs luajit` endif FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ Index: tools/Makefile =================================================================== --- tools/Makefile.orig 2018-08-29 16:09:52.447078198 +0200 +++ tools/Makefile 2018-08-29 16:13:15.690810512 +0200 @@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I PROGRAM += $(d)repack-thes-dict -$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") - include $(TOP)Makefile.target Index: src/libresrc/Makefile =================================================================== --- src/libresrc/Makefile.orig 2018-08-29 16:09:52.447078198 +0200 +++ src/libresrc/Makefile 2018-08-29 16:13:15.690810512 +0200 @@ -10,7 +10,7 @@ resrc_OBJ := \ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp -RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua +RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua $(d)bitmap.cpp: $(d)bitmap.h $(d)default_config.cpp: $(d)default_config.h Index: tools/respack.lua =================================================================== --- tools/respack.lua.orig 2018-08-29 16:09:52.447078198 +0200 +++ tools/respack.lua 2018-08-29 16:13:15.690810512 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env luajit +#!/usr/bin/lua -- Copyright (c) 2014, Thomas Goyne -- -- Permission to use, copy, modify, and distribute this software for any