summarylogtreecommitdiffstats
path: root/in-source-build.diff
blob: 22de2ddd2caf974ff40be87a2935e28eaeadd046 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
--- a/Makefile	2023-02-12 11:08:23.133779767 +0800
+++ b/Makefile	2023-02-12 11:13:08.907691463 +0800
@@ -225,22 +225,22 @@
 
 # Executables.
 
-linux_exes := $(addprefix ../, textadept textadept-curses)
+linux_exes := textadept textadept-curses
 win_exes := $(addprefix ../, textadept.exe textadept-curses.exe)
 osx_exes := $(addprefix ../, textadept-osx textadept-osx-curses)
 
 .PHONY: all curses win osx
 .DEFAULT_GOAL := all
 all: $(linux_exes)
-curses: ../textadept-curses
+curses: textadept-curses
 win: $(win_exes)
 osx: $(osx_exes)
 
 # Compile natively for Linux or BSD.
 
 $(linux_exes): $(common_objs)
-../textadept: $(gui_objs)
-../textadept-curses: $(curses_objs) $(termkey_unix_objs)
+textadept: $(gui_objs)
+textadept-curses: $(curses_objs) $(termkey_unix_objs)
 
 ifeq (Linux, $(shell uname -s))
 $(linux_exes): CXX := g++
@@ -252,11 +252,11 @@
 $(linux_exes): LDFLAGS += -Wl,--retain-symbols-file -Wl,$(shell pwd)/lua.sym
 endif
 ifdef GTK2
-../textadept: LDFLAGS += $(shell pkg-config --libs gtk+-2.0 gmodule-2.0)
+textadept: LDFLAGS += $(shell pkg-config --libs gtk+-2.0 gmodule-2.0)
 else
-../textadept: LDFLAGS += $(shell pkg-config --libs gtk+-3.0 gmodule-2.0)
+textadept: LDFLAGS += $(shell pkg-config --libs gtk+-3.0 gmodule-2.0)
 endif
-../textadept-curses: LDFLAGS += $(shell pkg-config --silence-errors --libs ncursesw || \
+textadept-curses: LDFLAGS += $(shell pkg-config --silence-errors --libs ncursesw || \
   pkg-config --silence-errors --libs ncurses || pkg-config --silence-errors --libs curses || \
   echo -lncursesw) -lpthread
 ifeq (Linux, $(shell uname -s))
@@ -312,9 +312,9 @@
 PIXMAPS_DIR ?= /usr/share/pixmaps
 desktop_files := $(wildcard *.desktop)
 ifeq (, $(findstring curses, $(MAKECMDGOALS)))
-  install_targets := ../textadept
+  install_targets := textadept
 else
-  install_targets := ../textadept-curses
+  install_targets := textadept-curses
 endif
 
 .PHONY: install uninstall
@@ -322,7 +322,7 @@
 	install -d $(DESTDIR)$(bin_dir) $(DESTDIR)$(data_dir)
 	install $^ $(DESTDIR)$(data_dir)
 	cp -rL $| $(DESTDIR)$(data_dir)
-	ln -s $(subst .., $(data_dir), $^) $(DESTDIR)$(bin_dir)
+	ln -s $(data_dir)/$^ $(DESTDIR)$(bin_dir)
 	if [ -d "$(XDG_DATA_DIR)" ]; then \
 		install -d $(DESTDIR)$(XDG_DATA_DIR); \
 		install $(desktop_files) $(DESTDIR)$(XDG_DATA_DIR); \