https://bugzilla.redhat.com/show_bug.cgi?id=1704522
Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |ASSIGNED
Assignee|nobody(a)fedoraproject.org |dominik(a)greysector.net
Flags| |fedora-review?
--- Comment #1 from Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
---
Fedora CFLAGS are not used during compilation, you can see it in the build.log:
[...]
cc -g -c -o ballop.o ballop.c
cc -g -c -o actors.o actors.c
cc -g -c -o demons.o demons.c
cc -g -c -o clockr.o clockr.c
cc -g -c -o dmain.o dmain.c
cc -g -c dgame.c
[...]
Instead of setting environment variables before calling make, set them on make
command line:
%build
%make_build \
CFLAGS="%{optflags}" \
DATADIR="%{_datadir}/%{name}" \
LDFLAGS="%{__global_ldflags}"
%install
%make_install \
BINDIR="%{buildroot}%{_bindir}" \
DATADIR="%{buildroot}%{_datadir}/%{name}/" \
LIBDIR="%{buildroot}%{_datadir}" \
MANDIR="%{buildroot}%{_mandir}"
With that, your makefile patch can be shortened to:
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -42,7 +45,7 @@ TERMFLAG =
# Uncomment the following line if you want to have access to the game
# debugging tool. This is invoked by typing "gdt". It is not much
# use except for debugging.
-GDTFLAG = -DALLOW_GDT
+# GDTFLAG = -DALLOW_GDT
# Compilation flags
CFLAGS = -g #-static
@@ -69,7 +72,7 @@ dungeon: $(OBJS) dtextc.dat
$(CC) $(CFLAGS) -o zork $(OBJS) $(LIBS)
install: zork dtextc.dat
- mkdir -p $(BINDIR) $(LIBDIR) $(MANDIR)/man6
+ mkdir -p $(BINDIR) $(DATADIR) $(LIBDIR) $(MANDIR)/man6
cp zork $(BINDIR)
cp dtextc.dat $(DATADIR)
cp dungeon.6 $(MANDIR)/man6/
diff --git a/dinit.c b/dinit.c
index d687cf4..cda5878 100644
--- a/dinit.c
+++ b/dinit.c
@@ -24,7 +24,7 @@ FILE *dbfile;
#define TEXTFILE "lib:dtextc.dat"
#else /* ! __AMOS__ */
#ifdef unix
-#define TEXTFILE "/usr/games/lib/dunlib/dtextc.dat"
+#define TEXTFILE "/usr/share/zork/dtextc.dat"
#else /* ! unix */
I need a definition for TEXTFILE
#endif /* ! unix */
--
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component