Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update buildsys #57

Merged
merged 2 commits into from
Jan 21, 2023
Merged

Conversation

radioactiveman
Copy link
Member

No description provided.

@jlindgren90
Copy link
Member

It looks like this reverts be6315f, 39ae6f7, and 5837a45 (maybe others).

What I would suggest here is to start a new branch from commit b1302e0 (the previous buildsys update), commit the updated files on that branch, and then merge it into master. That should preserve the Audacious-specific changes we've made.

@radioactiveman
Copy link
Member Author

radioactiveman commented Jan 19, 2023

That's a good approach, thanks.
Updated as suggested, the changes from upstream are: be6315f, 39ae6f7, 5837a45 and 0752c70.

@jlindgren90: Can I merge and squash this? Or do you want to test it on Windows at first?

In summary:

diff --git b/buildsys.mk.in a/buildsys.mk.in
index a4332357e..b75ae15dc 100644
--- b/buildsys.mk.in
+++ a/buildsys.mk.in
@@ -74,8 +74,8 @@ DEP_CXXFLAGS = @DEP_CXXFLAGS@
 DEP_OBJCFLAGS = @DEP_OBJCFLAGS@
 DEP_OBJCXXFLAGS = @DEP_OBJCXXFLAGS@
 LN_S = @LN_S@
-MKDIR_P = mkdir -p
-INSTALL = @INSTALL@
+MKDIR_P = @INSTALL@ -d
+INSTALL = @INSTALL@ -p
 SHELL = @SHELL@
 MSGFMT = @MSGFMT@
 JAVAC = @JAVAC@
@@ -579,7 +579,7 @@ locales: ${MO_FILES}
        ${COMPILE_STATUS}
        in="$<"; \
        out="$@"; \
-       if ${RC} ${RCFLAGS} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
+       if ${RC} ${RCFLAGS} -J rc -O coff -o $@ $<; then \
                ${COMPILE_OK}; \
        else \
                ${COMPILE_FAILED}; \
@@ -650,7 +650,7 @@ locales: ${MO_FILES}
                ${COMPILE_PLUGIN_FAILED}; \
        fi
 
-install: all install-extra
+install: install-extra
        for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
                test x"$$i" = x"" && continue; \
                ${DIR_ENTER}; \

@jlindgren90
Copy link
Member

@radioactiveman Go ahead and merge. Thanks!

@radioactiveman radioactiveman merged commit 1a28ff1 into audacious-media-player:master Jan 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants