Skip to content

Commit

Permalink
lowercase PREFIX
Browse files Browse the repository at this point in the history
This is a convention among build systems, eg Termux.
  • Loading branch information
stsp committed Dec 15, 2024
1 parent 6cd1033 commit c10e1c9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions 32/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ DOS_CC ?= i586-pc-msdosdjgpp-gcc
DOS_LD ?= i586-pc-msdosdjgpp-gcc
DOS_AS ?= i586-pc-msdosdjgpp-as
DOS_STRIP ?= i586-pc-msdosdjgpp-strip
PREFIX ?= /usr/local
DATADIR ?= $(PREFIX)/share/comcom32
prefix ?= /usr/local
DATADIR ?= $(prefix)/share/comcom32
C_OPT = -Wall -O2 -Wmissing-declarations -Wwrite-strings -I $(SRCDIR) -I .
# avoid CMOVxx instructions
C_OPT += -march=i386
Expand Down
2 changes: 1 addition & 1 deletion comcom64.spec.rpkg
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ make %{?_smp_mflags}
%define __strip /bin/true

%install
make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
make install DESTDIR=%{buildroot} prefix=%{_prefix}

%files
%defattr(-,root,root)
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
dh $@

override_dh_auto_install:
dh_auto_install $@ -- PREFIX=/usr
dh_auto_install $@ -- prefix=/usr
6 changes: 3 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PREFIX ?= /usr/local
DATADIR ?= $(PREFIX)/share/comcom64
prefix ?= /usr/local
DATADIR ?= $(prefix)/share/comcom64
CFLAGS = -Wall -Os -Wmissing-declarations -Wwrite-strings \
-ggdb3 -Wunused -Wmissing-prototypes
SOURCES = command.c cmdbuf.c mouse.c env.c psp.c umb.c ae0x.c compl.c clip.c \
Expand Down Expand Up @@ -45,7 +45,7 @@ uninstall:
rm -rf $(DATADIR)

# hook in dj64 - make sure to not do that before defining `all:` target
export PKG_CONFIG_PATH = $(PREFIX)/share/pkgconfig:$(PREFIX)/lib/pkgconfig
export PKG_CONFIG_PATH = $(prefix)/share/pkgconfig:$(prefix)/lib/pkgconfig
DJMK = $(shell pkg-config --variable=makeinc dj64)
ifeq ($(wildcard $(DJMK)),)
ifeq ($(filter clean,$(MAKECMDGOALS)),)
Expand Down

0 comments on commit c10e1c9

Please sign in to comment.