DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer require even "make dist" to write to the current directory

Browse Source
This commit is contained in:
Pierre Pronchery 2014-11-16 14:45:05 +01:00
parent 8c616151cb
commit 029a46b049
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/makefile.c
View File

@ -1733,9 +1733,9 @@ static int _write_dist(Configure * configure, FILE * fp, configArray * ca,
if(package == NULL || version == NULL) if(package == NULL || version == NULL)
return 0; return 0;
_makefile_target(fp, "dist", NULL); _makefile_target(fp, "dist", NULL);
_makefile_remove(fp, 1, "$(PACKAGE)-$(VERSION)", NULL); _makefile_remove(fp, 1, "$(OBJDIR)$(PACKAGE)-$(VERSION)", NULL);
_makefile_link(fp, 1, ".", "$(PACKAGE)-$(VERSION)"); _makefile_link(fp, 1, "\"$$PWD\"", "$(OBJDIR)$(PACKAGE)-$(VERSION)");
fputs("\t@$(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \\\n", fputs("\t@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \\\n",
fp); fp);
for(i = from + 1; i < to; i++) for(i = from + 1; i < to; i++)
{ {
@ -1749,7 +1749,7 @@ static int _write_dist(Configure * configure, FILE * fp, configArray * ca,
} }
else else
return 1; return 1;
_makefile_remove(fp, 0, "$(PACKAGE)-$(VERSION)", NULL); _makefile_remove(fp, 0, "$(OBJDIR)$(PACKAGE)-$(VERSION)", NULL);
return 0; return 0;
} }
@ -1758,7 +1758,7 @@ static int _write_distcheck(Configure * configure, FILE * fp)
String const * package; String const * package;
String const * version; String const * version;
const char pretarget[] = "\ndistcheck: dist\n" const char pretarget[] = "\ndistcheck: dist\n"
"\t$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz\n" "\t$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz\n"
"\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir\n" "\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir\n"
"\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir\n"; "\t$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir\n";
const char target[] = "\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\")\n" const char target[] = "\t(cd \"$(PACKAGE)-$(VERSION)\" && $(MAKE) OBJDIR=\"$$PWD/objdir/\")\n"