[PD-cvs] pd/extra/choice makefile,1.2,1.3