diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 9ee533f5b9b6e6fe948d68d61831e444b6691fb5..6f2419b2ad342a913d19c00454f1696ef6b49737 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -42,7 +42,11 @@ endif @echo " " @echo "win32_inno install succeeded!" -build_pd: +git_version: $(pd_src)/src/s_stuff.h.in + cd $(pd_src)/src/ && \ + sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h + +build_pd: git_version cd $(pd_src)/src && $(MAKE) -f makefile.mingw pd_install: build_pd diff --git a/pd/src/makefile.mingw b/pd/src/makefile.mingw index 647d76388f9dabd5f9ccff292da5164320527b8c..1dba6162a49e2277dac39e04a3efb83af6bdef8d 100755 --- a/pd/src/makefile.mingw +++ b/pd/src/makefile.mingw @@ -148,6 +148,11 @@ PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ifneq ($(PD_TEST_VERSION),) PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) endif +# AG: Pd-l2ork version number +PD_L2ORK_VERSION := $(shell grep PD_L2ORK_VERSION m_pd.h | \ + sed 's|^.define *PD_L2ORK_VERSION *"\(.*\)".*|\1|' ) +PD_BUILD_VERSION := $(shell grep PD_BUILD_VERSION s_stuff.h | \ + sed 's|^.define *PD_BUILD_VERSION *"\(.*\)".*|\1|' ) # @@ -294,7 +299,7 @@ install: all install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ done mv $(ABOUT_FILE) $(ABOUT_FILE).tmp - cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \ + cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_L2ORK_VERSION) ($(PD_BUILD_VERSION))|' \ > $(ABOUT_FILE) rm $(ABOUT_FILE).tmp install -d $(libpddir)/extra