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

Fix make dist #45

Merged
merged 1 commit into from
Jul 8, 2014
Merged

Fix make dist #45

merged 1 commit into from
Jul 8, 2014

Conversation

hasufell
Copy link
Collaborator

@hasufell hasufell commented Jul 7, 2014

#34

@nicklan
Copy link
Owner

nicklan commented Jul 7, 2014

I get:
make[2]: *** No rule to make target 'ChangeLog', needed by 'distdir'. Stop.

when I try to run make dist now

@hasufell
Copy link
Collaborator Author

hasufell commented Jul 7, 2014

Nick Lanham:

I get:
make[2]: *** No rule to make target 'ChangeLog', needed by 'distdir'. Stop.

when I try to run make dist now

Did you run ./autogen.sh after that change?

@nicklan
Copy link
Owner

nicklan commented Jul 7, 2014

yeah, i did. i can dig deeper a little later if you can't reproduce.

@hasufell
Copy link
Collaborator Author

hasufell commented Jul 7, 2014

Nick Lanham:

yeah, i did. i can dig deeper a little later if you can't reproduce.

Oh right. autogen.sh overwrites Makefile.in.in. I'll just add a dummy
ChangeLog.

@nicklan
Copy link
Owner

nicklan commented Jul 7, 2014

Seems that autogen.sh changes back the line in po/Makefile.in.in to require ChangeLog, not sure why.

$ git reset --hard
HEAD is now at 32e6d8c Fix make dist

$ ./autogen.sh
--- snip ---

$ git diff
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -35,7 +35,7 @@ subdir = po

 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = mkdir -p

 CC = @CC@
 GENCAT = @GENCAT@
@@ -56,7 +56,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 SOURCES = 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = LINGUAS Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
 $(POFILES) $(GMOFILES) $(SOURCES)

@hasufell
Copy link
Collaborator Author

hasufell commented Jul 7, 2014

Nick Lanham:

Seems that autogen.sh changes back the line in po/Makefile.in.in to require ChangeLog, not sure why.

Yeah, I added a dummy changelog. That's because of glib-gettextize which
does not automatically create a changelog like gettextize.

@nicklan
Copy link
Owner

nicklan commented Jul 8, 2014

Did you mean to push a change with the ChangeLog file? I can probably add that too.

@hasufell
Copy link
Collaborator Author

hasufell commented Jul 8, 2014

Did you mean to push a change with the ChangeLog file? I can probably add that too.

I'm not sure what you mean. There is an empty ChangeLog file in the pull request, yeah.

@nicklan
Copy link
Owner

nicklan commented Jul 8, 2014

Hah indeed there is, sorry, let me check this and then merge

nicklan added a commit that referenced this pull request Jul 8, 2014
Fix make dist.

Looks good and works for me.  Thanks!
@nicklan nicklan merged commit 3a1659c into nicklan:master Jul 8, 2014
@nicklan nicklan mentioned this pull request Jul 8, 2014
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